61 files changed, 2278 insertions(+), 1005 deletions(-)

diff --git config_180529_2118/Items/consumable/consumable_xpboost.txt config_180604_1906/Items/consumable/consumable_xpboost.txt
index 94064bc..8bff611 100644
--- config_180529_2118/Items/consumable/consumable_xpboost.txt
+++ config_180604_1906/Items/consumable/consumable_xpboost.txt
@@ -1,8 +1,8 @@
 actions:
 - planexpboost:
     additionalPercentage: '100'
-    duration: '1800'
+    duration: '1830'
 icon: ItemUnknown
 id: consumable_xpboost
 slot: ConsumableAction
 uses: '1'
diff --git config_180604_1906/Items/quest/DQ_CS_11LOW_crow_T3_moose_meat_horde.txt config_180604_1906/Items/quest/DQ_CS_11LOW_crow_T3_moose_meat_horde.txt
new file mode 100644
index 0000000..7cbeca9
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_11LOW_crow_T3_moose_meat_horde.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_11LOW_crow_T3_moose_meat_horde
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_12LOW_ninjaA_T2_bomb_cat_bomb.txt config_180604_1906/Items/quest/DQ_CS_12LOW_ninjaA_T2_bomb_cat_bomb.txt
new file mode 100644
index 0000000..550afca
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_12LOW_ninjaA_T2_bomb_cat_bomb.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_12LOW_ninjaA_T2_bomb_cat_bomb
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_13LOW_willowisp_T2_toxic_crystal.txt config_180604_1906/Items/quest/DQ_CS_13LOW_willowisp_T2_toxic_crystal.txt
new file mode 100644
index 0000000..4321d6d
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_13LOW_willowisp_T2_toxic_crystal.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_13LOW_willowisp_T2_toxic_crystal
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_21MID_minelayer_dog_waste.txt config_180604_1906/Items/quest/DQ_CS_21MID_minelayer_dog_waste.txt
new file mode 100644
index 0000000..1e4860d
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_21MID_minelayer_dog_waste.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_21MID_minelayer_dog_waste
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_22MID_wraith_T3_ashes.txt config_180604_1906/Items/quest/DQ_CS_22MID_wraith_T3_ashes.txt
new file mode 100644
index 0000000..523dfe6
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_22MID_wraith_T3_ashes.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_22MID_wraith_T3_ashes
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_23MID_crawler_fisher_crab_parts.txt config_180604_1906/Items/quest/DQ_CS_23MID_crawler_fisher_crab_parts.txt
new file mode 100644
index 0000000..9ca3858
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_23MID_crawler_fisher_crab_parts.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_23MID_crawler_fisher_crab_parts
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_31HGH_angel2_bio_interface_prototype.txt config_180604_1906/Items/quest/DQ_CS_31HGH_angel2_bio_interface_prototype.txt
new file mode 100644
index 0000000..b389a2b
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_31HGH_angel2_bio_interface_prototype.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_31HGH_angel2_bio_interface_prototype
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_32HGH_sweeper_eradicator_shield_generator.txt config_180604_1906/Items/quest/DQ_CS_32HGH_sweeper_eradicator_shield_generator.txt
new file mode 100644
index 0000000..9b1df04
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_32HGH_sweeper_eradicator_shield_generator.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_32HGH_sweeper_eradicator_shield_generator
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_33HGH_teslafortress_T5_ra_energy.txt config_180604_1906/Items/quest/DQ_CS_33HGH_teslafortress_T5_ra_energy.txt
new file mode 100644
index 0000000..a7f2cc5
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_33HGH_teslafortress_T5_ra_energy.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_33HGH_teslafortress_T5_ra_energy
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_41MTN_vampire_escape_pod.txt config_180604_1906/Items/quest/DQ_CS_41MTN_vampire_escape_pod.txt
new file mode 100644
index 0000000..fb9768f
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_41MTN_vampire_escape_pod.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_41MTN_vampire_escape_pod
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CS_51HMT_hammerplanet2_kinetic_sphere_core.txt config_180604_1906/Items/quest/DQ_CS_51HMT_hammerplanet2_kinetic_sphere_core.txt
new file mode 100644
index 0000000..5debfe6
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CS_51HMT_hammerplanet2_kinetic_sphere_core.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CS_51HMT_hammerplanet2_kinetic_sphere_core
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_11LOW_flamer_T2_flamer_tank.txt config_180604_1906/Items/quest/DQ_CX_11LOW_flamer_T2_flamer_tank.txt
new file mode 100644
index 0000000..63fa53a
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_11LOW_flamer_T2_flamer_tank.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_11LOW_flamer_T2_flamer_tank
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_12LOW_unicorn_T2_rhino_horn.txt config_180604_1906/Items/quest/DQ_CX_12LOW_unicorn_T2_rhino_horn.txt
new file mode 100644
index 0000000..ad7fb21
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_12LOW_unicorn_T2_rhino_horn.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_12LOW_unicorn_T2_rhino_horn
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_13LOW_bees_T2_nano_honey.txt config_180604_1906/Items/quest/DQ_CX_13LOW_bees_T2_nano_honey.txt
new file mode 100644
index 0000000..74df515
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_13LOW_bees_T2_nano_honey.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_13LOW_bees_T2_nano_honey
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_21MID_hopper_T3_plane_data_core.txt config_180604_1906/Items/quest/DQ_CX_21MID_hopper_T3_plane_data_core.txt
new file mode 100644
index 0000000..0bee037
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_21MID_hopper_T3_plane_data_core.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_21MID_hopper_T3_plane_data_core
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_22MID_zombies_T3_zombie_bone.txt config_180604_1906/Items/quest/DQ_CX_22MID_zombies_T3_zombie_bone.txt
new file mode 100644
index 0000000..7cd8582
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_22MID_zombies_T3_zombie_bone.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_22MID_zombies_T3_zombie_bone
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_23MID_sharks_T3_shark_tooth.txt config_180604_1906/Items/quest/DQ_CX_23MID_sharks_T3_shark_tooth.txt
new file mode 100644
index 0000000..55858cd
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_23MID_sharks_T3_shark_tooth.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_23MID_sharks_T3_shark_tooth
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_31HGH_bonesnake_T5_toxic_waste.txt config_180604_1906/Items/quest/DQ_CX_31HGH_bonesnake_T5_toxic_waste.txt
new file mode 100644
index 0000000..867ddda
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_31HGH_bonesnake_T5_toxic_waste.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_31HGH_bonesnake_T5_toxic_waste
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_32HGH_pulser_T4_plague_bacteria.txt config_180604_1906/Items/quest/DQ_CX_32HGH_pulser_T4_plague_bacteria.txt
new file mode 100644
index 0000000..777883f
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_32HGH_pulser_T4_plague_bacteria.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_32HGH_pulser_T4_plague_bacteria
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_33HGH_blinks_T5_blink_data_core.txt config_180604_1906/Items/quest/DQ_CX_33HGH_blinks_T5_blink_data_core.txt
new file mode 100644
index 0000000..8eb889f
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_33HGH_blinks_T5_blink_data_core.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_33HGH_blinks_T5_blink_data_core
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_41MTN_dragonmama_T8_beast_claw.txt config_180604_1906/Items/quest/DQ_CX_41MTN_dragonmama_T8_beast_claw.txt
new file mode 100644
index 0000000..b30984f
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_41MTN_dragonmama_T8_beast_claw.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_41MTN_dragonmama_T8_beast_claw
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_41MTN_tuna_T7_prison_box.txt config_180604_1906/Items/quest/DQ_CX_41MTN_tuna_T7_prison_box.txt
new file mode 100644
index 0000000..b832845
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_41MTN_tuna_T7_prison_box.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_41MTN_tuna_T7_prison_box
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_51HMT_highmountainhunter_eye_of_meowza.txt config_180604_1906/Items/quest/DQ_CX_51HMT_highmountainhunter_eye_of_meowza.txt
new file mode 100644
index 0000000..e6276a0
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_51HMT_highmountainhunter_eye_of_meowza.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_51HMT_highmountainhunter_eye_of_meowza
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_CX_51HMT_ninjaleader_list_of_names.txt config_180604_1906/Items/quest/DQ_CX_51HMT_ninjaleader_list_of_names.txt
new file mode 100644
index 0000000..3f952ec
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_CX_51HMT_ninjaleader_list_of_names.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_CX_51HMT_ninjaleader_list_of_names
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_SP_5XHMT_heist_botcoins.txt config_180604_1906/Items/quest/DQ_SP_5XHMT_heist_botcoins.txt
new file mode 100644
index 0000000..b3fe0a2
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_SP_5XHMT_heist_botcoins.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_SP_5XHMT_heist_botcoins
+slot: Quest
+tier: '-1'
diff --git config_180604_1906/Items/quest/DQ_SP_5XHMT_mine_ancient_idol.txt config_180604_1906/Items/quest/DQ_SP_5XHMT_mine_ancient_idol.txt
new file mode 100644
index 0000000..435ec9c
--- /dev/null
+++ config_180604_1906/Items/quest/DQ_SP_5XHMT_mine_ancient_idol.txt
@@ -0,0 +1,4 @@
+icon: ItemUpgrade_Generic
+id: DQ_SP_5XHMT_mine_ancient_idol
+slot: Quest
+tier: '-1'
diff --git config_180529_2118/Quests/quests_daily.txt config_180604_1906/Quests/quests_daily.txt
index 5e1c05f..0443ba7 100644
--- config_180529_2118/Quests/quests_daily.txt
+++ config_180604_1906/Quests/quests_daily.txt
@@ -23,11 +23,11 @@
   tier: '3'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_botcoins
+    - id: DQ_SP_5XHMT_heist_botcoins
     setpiece: DQ_SP_5XHMT_heist
     target: '1'
     type: collect
     units:
     - id: DQ_SP_5XHMT_heist_treasure
@@ -50,11 +50,11 @@
   tier: '8'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_ancient_idol
+    - id: DQ_SP_5XHMT_mine_ancient_idol
     setpiece: DQ_SP_5XHMT_mine
     target: '1'
     type: collect
     units:
     - id: DQ_SP_5XHMT_mine_treasure
@@ -354,11 +354,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '8'
 - goals:
   - items:
-    - id: quest_flamer_tank
+    - id: DQ_CX_11LOW_flamer_T2_flamer_tank
     target: '3'
     type: collect
     units:
     - id: flamer
   id: DQ_CX_11LOW_flamer_T2
@@ -371,11 +371,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '2'
 - goals:
   - items:
-    - id: quest_rhino_horn
+    - id: DQ_CX_12LOW_unicorn_T2_rhino_horn
     target: '3'
     type: collect
     units:
     - id: unicorn
   id: DQ_CX_12LOW_unicorn_T2
@@ -388,11 +388,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '2'
 - goals:
   - items:
-    - id: quest_nano_honey
+    - id: DQ_CX_13LOW_bees_T2_nano_honey
     target: '3'
     type: collect
     units:
     - id: beequeen
   id: DQ_CX_13LOW_bees_T2
@@ -405,11 +405,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '2'
 - goals:
   - items:
-    - id: quest_plane_data_core
+    - id: DQ_CX_21MID_hopper_T3_plane_data_core
     target: '3'
     type: collect
     units:
     - id: hopperleader
   id: DQ_CX_21MID_hopper_T3
@@ -422,11 +422,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '3'
 - goals:
   - items:
-    - id: quest_zombie_bone
+    - id: DQ_CX_22MID_zombies_T3_zombie_bone
     target: '3'
     type: collect
     units:
     - id: zombiequeen
   id: DQ_CX_22MID_zombies_T3
@@ -439,11 +439,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '3'
 - goals:
   - items:
-    - id: quest_shark_tooth
+    - id: DQ_CX_23MID_sharks_T3_shark_tooth
     target: '3'
     type: collect
     units:
     - id: whaleshark
   id: DQ_CX_23MID_sharks_T3
@@ -456,11 +456,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '3'
 - goals:
   - items:
-    - id: quest_toxic_waste
+    - id: DQ_CX_31HGH_bonesnake_T5_toxic_waste
     target: '3'
     type: collect
     units:
     - id: bonesnake01
   id: DQ_CX_31HGH_bonesnake_T5
@@ -473,11 +473,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '5'
 - goals:
   - items:
-    - id: quest_plague_bacteria
+    - id: DQ_CX_32HGH_pulser_T4_plague_bacteria
     target: '3'
     type: collect
     units:
     - id: pulser
   id: DQ_CX_32HGH_pulser_T4
@@ -490,11 +490,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '4'
 - goals:
   - items:
-    - id: quest_blink_data_core
+    - id: DQ_CX_33HGH_blinks_T5_blink_data_core
     target: '3'
     type: collect
     units:
     - id: blinkleader
   id: DQ_CX_33HGH_blinks_T5
@@ -509,11 +509,11 @@
   tier: '5'
 - goals:
   - fallbackGuidanceTargets:
     - tunaleader
     items:
-    - id: quest_prison_box
+    - id: DQ_CX_41MTN_tuna_T7_prison_box
     target: '3'
     type: collect
     units:
     - id: tuna
   id: DQ_CX_41MTN_tuna_T7
@@ -527,11 +527,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '7'
 - goals:
   - items:
-    - id: quest_beast_claw
+    - id: DQ_CX_41MTN_dragonmama_T8_beast_claw
     target: '3'
     type: collect
     units:
     - id: dragonmama
   id: DQ_CX_41MTN_dragonmama_T8
@@ -544,11 +544,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '8'
 - goals:
   - items:
-    - id: quest_eye_of_meowza
+    - id: DQ_CX_51HMT_highmountainhunter_eye_of_meowza
     target: '3'
     type: collect
     units:
     - id: highmountainhunter
   id: DQ_CX_51HMT_highmountainhunter
@@ -561,11 +561,11 @@
   showInaccessible: 'false'
   source: giver
   tier: '8'
 - goals:
   - items:
-    - id: quest_list_of_names
+    - id: DQ_CX_51HMT_ninjaleader_list_of_names
     target: '3'
     type: collect
     units:
     - id: ninjaleader
   id: DQ_CX_51HMT_ninjaleader
@@ -793,11 +793,11 @@
   tier: '8'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_moose_meat_horde
+    - id: DQ_CS_11LOW_crow_T3_moose_meat_horde
     target: '3'
     type: collect
     units:
     - id: DQ_CS_11LOW_crow
   id: DQ_CS_11LOW_crow_T3
@@ -813,11 +813,11 @@
   tier: '3'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_bomb_cat_bomb
+    - id: DQ_CS_12LOW_ninjaA_T2_bomb_cat_bomb
     target: '3'
     type: collect
     units:
     - id: DQ_CS_12LOW_ninjaA
   id: DQ_CS_12LOW_ninjaA_T2
@@ -833,11 +833,11 @@
   tier: '2'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_toxic_crystal
+    - id: DQ_CS_13LOW_willowisp_T2_toxic_crystal
     target: '3'
     type: collect
     units:
     - id: DQ_CS_13LOW_willowispleader
   id: DQ_CS_13LOW_willowisp_T2
@@ -853,11 +853,11 @@
   tier: '2'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_dog_waste
+    - id: DQ_CS_21MID_minelayer_dog_waste
     target: '3'
     type: collect
     units:
     - id: DQ_CS_21MID_minelayer
   id: DQ_CS_21MID_minelayer
@@ -876,11 +876,11 @@
   goals:
   - fallbackGuidanceTargets:
     - DQ_CS_22MID_master
     - DQ_CS_22MID_wraith
     items:
-    - id: quest_ashes
+    - id: DQ_CS_22MID_wraith_T3_ashes
     target: '3'
     type: collect
     units:
     - id: DQ_CS_22MID_wraith
   id: DQ_CS_22MID_wraith_T3
@@ -896,11 +896,11 @@
   tier: '3'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_fisher_crab_parts
+    - id: DQ_CS_23MID_crawler_fisher_crab_parts
     target: '3'
     type: collect
     units:
     - id: DQ_CS_23MID_crawler
   id: DQ_CS_23MID_crawler
@@ -919,11 +919,11 @@
   goals:
   - fallbackGuidanceTargets:
     - DQ_CS_31HGH_angel2master
     - DQ_CS_31HGH_angel2
     items:
-    - id: quest_bio_interface_prototype
+    - id: DQ_CS_31HGH_angel2_bio_interface_prototype
     target: '3'
     type: collect
     units:
     - id: DQ_CS_31HGH_angel2
   id: DQ_CS_31HGH_angel2
@@ -939,11 +939,11 @@
   tier: '5'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_eradicator_shield_generator
+    - id: DQ_CS_32HGH_sweeper_eradicator_shield_generator
     target: '3'
     type: collect
     units:
     - id: DQ_CS_32HGH_sweeper
   id: DQ_CS_32HGH_sweeper
@@ -961,11 +961,11 @@
   completeAtGiver: tavern
   goals:
   - fallbackGuidanceTargets:
     - DQ_CS_33HGH_teslafortress
     items:
-    - id: quest_ra_energy
+    - id: DQ_CS_33HGH_teslafortress_T5_ra_energy
     target: '3'
     type: collect
     units:
     - id: DQ_CS_33HGH_teslatower
   id: DQ_CS_33HGH_teslafortress_T5
@@ -981,11 +981,11 @@
   tier: '5'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_escape_pod
+    - id: DQ_CS_41MTN_vampire_escape_pod
     target: '3'
     type: collect
     units:
     - id: DQ_CS_41MTN_vampire
   id: DQ_CS_41MTN_vampire
@@ -1001,11 +1001,11 @@
   tier: '6'
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - items:
-    - id: quest_kinetic_sphere_core
+    - id: DQ_CS_51HMT_hammerplanet2_kinetic_sphere_core
     target: '3'
     type: collect
     units:
     - id: DQ_CS_51HMT_hammerplanet2
   id: DQ_CS_51HMT_hammerplanet2
diff --git config_180529_2118/Texts/en-US/bark.txt config_180604_1906/Texts/en-US/bark.txt
index b951ed6..4413fb1 100644
--- config_180529_2118/Texts/en-US/bark.txt
+++ config_180604_1906/Texts/en-US/bark.txt
@@ -45,191 +45,10 @@ BOS1_meowzaStageA0:
   randomOptions:
   - text: stageA0
 BOS1_meowzaStageB0:
   randomOptions:
   - text: stageB0
-DQ_CX_11LOW_flamer_T2_encounter:
-  randomOptions:
-  - text: Everyone looks like a marshmallow to me!
-  - text: Let’s get toasty!
-  - text: Want some s’more?
-  - text: Need a light?
-DQ_CX_11LOW_flamer_T2_sgt_start:
-  randomOptions:
-  - text: 'Those guys smell like campfires and marshmallows.
-
-      Really disturbing.'
-DQ_CX_12LOW_unicorn_T2_encounter:
-  randomOptions:
-  - text: You aren’t very...pure, are you?
-  - text: Impure! Unclean!
-  - text: There’s no way I’m giving you a ride.
-DQ_CX_12LOW_unicorn_T2_sgt_start:
-  randomOptions:
-  - text: Only a virgin can catch a unicorn. Read that in a fancy book.
-DQ_CX_13LOW_bees_T2_encounter:
-  randomOptions:
-  - text: Bzzz! Bzzz!
-  - text: No honey for you, crumpet monster!
-DQ_CX_13LOW_bees_T2_sgt_start:
-  randomOptions:
-  - text: My crumpets aren’t the same without fresh honey. Just a drizzle...
-DQ_CX_21MID_hopper_T3_sgt_start:
-  randomOptions:
-  - text: "It’d be a disaster if they figure out how disorganized we are. \nFour-dee chess! Four-Dee."
-DQ_CX_22MID_zombies_T3_encounter:
-  randomOptions:
-  - text: Join us.
-  - text: Your bones are perfect.
-  - text: Quite rude to be so alive!
-DQ_CX_22MID_zombies_T3_sgt_start:
-  randomOptions:
-  - text: Current theory? They slurp up bones from the mass graves below.
-DQ_CX_23MID_sharks_T3_encounter:
-  randomOptions:
-  - text: '[Distance songs of home play eerily]'
-  - text: '[An underwater melody competes with static]'
-  - text: '[Ooooeeewwah...wooeee]'
-  - text: '[Dun dun dun dun dun dun dun dun]'
-DQ_CX_23MID_sharks_T3_sgt_start:
-  randomOptions:
-  - text: "Back in the day, we were so clever. Just swing behind the shark, away from the front guns. \nAnd bam, wiped by the fish swarms. Lost Jim that way."
-DQ_CX_31HGH_bonesnake_T5_encounter:
-  randomOptions:
-  - text: OUR PROGRAMMING DOES NOT RECOGNIZE ECONOMIC EXTERNALITIES
-  - text: STOP INTERFERING WITH OUR PRAGMATIC INDUSTRIAL PROCESSES
-  - text: IT IS ONLY POISON IF YOU ARE NOT A ROBOT
-  - text: BURNING TOXIC WASTE IS EFFICIENT
-  - text: DUMPING WASTE JUST DELAYS THE SOCIETAL ISSUE.
-DQ_CX_31HGH_bonesnake_T5_sgt_start:
-  randomOptions:
-  - text: You might want to wear gloves for this one.
-DQ_CX_32HGH_pulser_T4_encounter:
-  randomOptions:
-  - text: Only the Decadent become Infected.
-  - text: Disease is a test of Purity
-  - text: Dirty Birds. Infect one, infect them all.
-DQ_CX_32HGH_pulser_T4_sgt_start:
-  randomOptions:
-  - text: I had the Pox back in ‘06. At first I blamed Matilda. But it wasn’t her fault.
-DQ_CX_33HGH_blinks_T5_encounter:
-  randomOptions:
-  - text: Do Si Do!
-  - text: Promenade!
-  - text: Roll Away To A Half Sashay!
-  - text: Box the Gnat!
-  - text: Weave the Ring!
-  - text: Un, deux, trois!
-  - text: Pirouette!
-DQ_CX_33HGH_blinks_T5_sgt_start:
-  randomOptions:
-  - text: I did love dancing. The swing, the crowd, the hot barn. Wish I still had my leg.
-DQ_CX_41MTN_tuna_T7_encounter:
-  randomOptions:
-  - text: "Criminals can’t be called slaves. \nIt is in our constitution!"
-  - text: We prefer the term ‘Brig Economy’
-  - text: Oh sure, next you’ll want to demolish structural inequality!
-DQ_CX_41MTN_tuna_T7_firstencounter:
-  randomOptions:
-  - text: 'No slaves here!
-
-      In late capitalism, contracts are binding.'
-DQ_CX_41MTN_tuna_T7_sgt_start:
-  randomOptions:
-  - text: Those boys owe me from our last poker game. You better bring them back or there’ll be hell to pay.
-DQ_CX_51HMT_dragonmama_T8_encounter:
-  randomOptions:
-  - text: Die. Little. Birds.
-  - text: You. Are. Meat.
-  - text: Not. Worthy. Of. Dinner.
-DQ_CX_51HMT_dragonmama_T8_sgt_start:
-  randomOptions:
-  - text: Declawing animals is cruel. Wooed my first wife by telling her that. Now look at us.
-DQ_KX_11LOW_crow_T2_firstencounter:
-  randomOptions:
-  - text: '[Recording Rebel activity]'
-  - text: Bleeeat. Bleat. I’m totally a deer
-DQ_KX_11LOW_crow_T2_firstkill:
-  randomOptions:
-  - text: They said this was easy money!
-DQ_KX_11LOW_crow_T2_sgt_start:
-  randomOptions:
-  - text: The deer will likely be grazing around the old nobility's hunting grounds.
-DQ_KX_12LOW_lasership_T2_firstkill:
-  randomOptions:
-  - text: I was following orders!
-DQ_KX_12LOW_lasership_T2_sgt_start:
-  randomOptions:
-  - text: That place had great donuts, dammit.
-DQ_KX_13LOW_centipede_T2_firstencounter:
-  randomOptions:
-  - text: Skree?!
-DQ_KX_13LOW_centipede_T2_firstkill:
-  randomOptions:
-  - text: Skrreeeee!
-DQ_KX_13LOW_centipede_T2_sgt_start:
-  randomOptions:
-  - text: Those damn Catipedes keep popping up. God, I hate robobugs.
-DQ_KX_21MID_stardogleader_firstencounter:
-  randomOptions:
-  - text: The master feeds us!
-  - text: We are good dogs!
-  - text: Who's a good boy? Me! I'm a good boy!
-DQ_KX_21MID_stardogleader_sgt_start:
-  randomOptions:
-  - text: I dislike professional competition.
-DQ_KX_22MID_trainB01_T3_encounter:
-  randomOptions:
-  - text: Taking evasive actions!
-  - text: Thieves!
-  - text: Pirates!
-  - text: Stopping blowing up our toilet paper shipments!
-DQ_KX_22MID_trainB01_T3_sgt_start:
-  randomOptions:
-  - text: Truth is they are transporting toilet paper. Hit ‘em where it hurts.
-DQ_KX_23MID_squid_T3_sgt_start:
-  randomOptions:
-  - text: 'Them biggun cephalopods seriously suck.
-
-      Gotta pay the bills.'
-DQ_KX_31HGH_robo_T4_firstencounter:
-  randomOptions:
-  - text: WHY ATTACK. WE JUST WANT LOVE.
-  - text: ROBOTS ARE NOT BAD. WE ARE JUST PROGRAMMED THIS WAY.
-DQ_KX_31HGH_robo_T4_sgt_start:
-  randomOptions:
-  - text: 'Do you find robots sexy, kid? Well...you might like this mission.
-
-      More than you should.'
-DQ_KX_32HGH_hurtsnakeleader_T4_encounter:
-  randomOptions:
-  - text: Out like a light!
-  - text: You can’t stop us! We need these fresh livers!
-DQ_KX_32HGH_hurtsnakeleader_T4_sgt_start:
-  randomOptions:
-  - text: 'People just fall over into their morning oatmeal. Splat.
-
-      Then they wake up with no liver.'
-DQ_KX_41MTN_vampire_T6_firstencounter:
-  randomOptions:
-  - text: These birds die so easily.
-  - text: Rebels are poorly trained.
-  - text: Such riff-raff.
-  - text: I bet Rebels went to public school.
-DQ_KX_41MTN_vampire_T6_sgt_start:
-  randomOptions:
-  - text: Those Estate Guards are classist jerks. Like, god, I hate them.
-DQ_KX_51HMT_bunny_T8_encounter:
-  randomOptions:
-  - text: 'NEWS ALERT: Rebels Eat Babies!'
-  - text: 'BREAKING: Cats. Always innocent.'
-  - text: 'SHOCKER: Birds are the real Deep State!'
-  - text: 'JUST IN: Meowza is Loved by Children, Old People. Even Monkeys.'
-  - text: 'BUSTED: Budgies are Bloodthirsty Dictators.'
-DQ_KX_51HMT_bunny_T8_sgt_start:
-  randomOptions:
-  - text: Sneak into the Imperial Palace and turn their damned smiles upside down.
 asleep:
   randomOptions:
   - text: Zzz...
     weight: '1'
 avatar:
diff --git config_180529_2118/Texts/en-US/events.txt config_180604_1906/Texts/en-US/events.txt
index ce8a8d3..d04c237 100644
--- config_180529_2118/Texts/en-US/events.txt
+++ config_180604_1906/Texts/en-US/events.txt
@@ -1,9 +1,79 @@
+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}- Start: {1}\n - End: {2}\n"
+  ending_server_message: Enemy activity in the noble estates returning to normal.
+  header_image: example_header_image
+  starting_server_message: Enemy activity is surging in noble estates. Bonus XP and superior salvage.
+  title: Friday Nobility
+event_daily_monday:
+  description: "Every Monday, Northern missions to icey locales gain a major experience bonus.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage on ice missions\n - Double XP on all ice missions\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: The icy winds of the north cease their howling.
+  header_image: example_header_image
+  starting_server_message: The icy winds of the north are rising. Seek out the snowy monastery for fine treasures
+  title: Monday Chill
+event_daily_saturday:
+  description: "Every Saturday, the nobles and their lackies pay service to the Great Leader. They offer their tithing and supply reports on how much they have extracted from their territories. All that is expected is absolute obedience.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in Imperial Capital\n - Double XP in Imperial Capital\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: Enemy activity in the Imperial Capital returning to normal.
+  header_image: example_header_image
+  starting_server_message: Enemy activity is surging Imperial Capital. Bonus XP and superior salvage.
+  title: Saturday Worship
+event_daily_sunday:
+  description: "Every Sunday, the robotic factories start shipping out their production from the previous week. Smart rebels use this opportunity to stock up.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in robo-factory\n - Double XP in robo-factory\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: Enemy activity in the highlands returning to normal.
+  header_image: example_header_image
+  starting_server_message: Enemy activity is surging in the robo factories of the highlands. Bonus XP and superior salvage.
+  title: Sunday Highlands
+event_daily_thursday:
+  description: "Every Thursday, the Imperial Archeologists load their finds onto caravans and ship them back to secure storage.\n\nThe empire sustains itself on this ancient remnants of dead civilizations. We are but their shadow.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in archeology zone\n - Double XP in archeology zone\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: Enemy activity in the highlands returning to normal.
+  header_image: example_header_image
+  starting_server_message: Enemy activity is surging the highlands archaeological digs. Bonus XP and superior salvage.
+  title: Thursday Ruins
+event_daily_tuesday:
+  description: "Every Tuesday, the hospital complexes release augmented patients. Save them from a fate worse than death.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in medical zone\n - Double XP in medical zone\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: Enemy activity in the highlands returning to normal.
+  header_image: example_header_image
+  starting_server_message: Enemy activity is surging in medical zone in the highlands. Bonus XP and superior salvage.
+  title: Tuesday Medicine
+event_daily_wednesday:
+  description: "Every Wednesday, back tunnels under the earth open up into the Imperial Reeducation camps. Earn Bonus XP and Superior salvage\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage on fire missions\n - Double XP on all fire missions\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: The secret paths to the Reeducation camps are closed.
+  header_image: example_header_image
+  starting_server_message: Fresh magma tubes are venting to the surface. Seek out the Reeducation camp for treasure.
+  title: Wednesday Brimstone
 friends_event:
-  ending: Friends time is over!
-  starting: Friends can join now!
+  description: "To kick off the winter season, the Empire is transferring fuel from the poor outer regions into the capital city.\n\nThey've commissioned elite guards around the fuel depots in the lowlands.  And there's rumor of a cruel Noble guarding the main supplies inside the city walls.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Golden Raptor skin\n - Double XP all day Friday\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: Friends time is over!
+  header_image: example_header_image
+  starting_server_message: Friends can join now!
+  title: Friendly Fridays
+news_about_news:
+  description: 'That''s right, we''re so proud of this new news feature that we are using it to announce a new news feature.
+
+
+    Check back with this UI in the future for more news.
+
+    '
+  header_image: example_header_image
+  title: 'News: We Now Have News'
+news_fowl_furculas:
+  description: "It’s been an exciting week with the latest 5-day playtest recently coming to an end. The team has been thrilled to see old and new players enjoying the game again, experiencing the new content and systems, and giving some great feedback! If you played in the playtest and have feedback, please send it to us via the Steambirds Alliance Discord or on the feedback forum thread, if you have access. \n"
+  header_image: ''
+  title: 'News: Fledgeling Fowl Furculas'
 playtest_event:
-  ending: The playtest is over!
-  starting: Playtest is starting now!
+  description: "To kick off the winter season, the Empire is transferring fuel from the poor outer regions into the capital city.\n\nThey've commissioned elite guards around the fuel depots in the lowlands.  And there's rumor of a cruel Noble guarding the main supplies inside the city walls.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Golden Raptor skin\n - Double XP all day Friday\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: The playtest is over!
+  header_image: example_header_image
+  starting_server_message: Playtest is starting now!
+  title: Pre-Launch Playtest
 test_event:
-  ending: ''
-  starting: ''
+  description: "This event is for testing, you should never see it when this feature is done.\n\nStop reading this, to simulate what that would be like.\n\nShhh.\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}- Start: {1}\n - End: {2}\n"
+  ending_server_message: ''
+  header_image: ''
+  starting_server_message: ''
+  title: TEST EVENT
+test_news:
+  description: 'This shouldn''t show up.
+
+    '
+  header_image: ''
+  title: TEST NEWS
diff --git config_180529_2118/Texts/en-US/item.txt config_180604_1906/Texts/en-US/item.txt
index 2e53a07..b2b5703 100644
--- config_180529_2118/Texts/en-US/item.txt
+++ config_180604_1906/Texts/en-US/item.txt
@@ -1,5 +1,83 @@
+DQ_CS_11LOW_crow_T3_moose_meat_horde:
+  description: A large pile of moose meat.
+  name: Moose Meat Horde
+DQ_CS_12LOW_ninjaA_T2_bomb_cat_bomb:
+  description: Each Bomb Cat Bomb is assigned to a cat.  The cat that the Bomb Cat Bomb is assigned to is called the 'Bomb Cat Bomb Cat.'
+  name: Bomb Cat Bomb
+DQ_CS_13LOW_willowisp_T2_toxic_crystal:
+  description: Poisonous fluid that has been condensed and frozen. Gives greater control over the release of toxins.
+  name: Toxic Crystal
+DQ_CS_21MID_minelayer_dog_waste:
+  description: It smells...awful.
+  name: Dog Waste
+DQ_CS_22MID_wraith_T3_ashes:
+  description: Said to contain the souls of downed pilots.
+  name: Ashes
+DQ_CS_23MID_crawler_fisher_crab_parts:
+  description: The remains of a destroyed Fisher Crab.  Must have been old...it's covered in barnacles.
+  name: Fisher Crab Parts
+DQ_CS_31HGH_angel2_bio_interface_prototype:
+  description: Torture devices that are strapped on to the Empire's slave pilots to make sure they follow orders.
+  name: Bio-Interface Prototype
+DQ_CS_32HGH_sweeper_eradicator_shield_generator:
+  description: This powerful shield can create a protective barrier on multiple units at once.
+  name: Eradicator Shield Generator
+DQ_CS_33HGH_teslafortress_T5_ra_energy:
+  description: The Empire uses these cubes to store raw solar energy. Sounds nice, but it's mostly used for burning villages.
+  name: Ra Energy
+DQ_CS_41MTN_vampire_escape_pod:
+  description: Contains an enemy pilot. You can hear him hurling insults in another language.
+  name: Escape Pod
+DQ_CS_51HMT_hammerplanet2_kinetic_sphere_core:
+  description: Even though it's only the size of a watermelon, it can act as a giant wrecking ball when the kinetic energy field is activated.
+  name: Kinetic Sphere Core
+DQ_CX_11LOW_flamer_T2_flamer_tank:
+  description: Highly Flammable Fuel. Smells like uncooked marshmallow.
+  name: Flamer Tank
+DQ_CX_12LOW_unicorn_T2_rhino_horn:
+  description: It sparkles. You feel so chaste. For the first time ever.
+  name: Rhino Horn
+DQ_CX_13LOW_bees_T2_nano_honey:
+  description: Nano package, Mega taste. Can be used in fine black tea.
+  name: Nano Honey
+DQ_CX_21MID_hopper_T3_plane_data_core:
+  description: Contains flight pattern data from our downed planes. Stimulating.
+  name: Plane Data Core
+DQ_CX_22MID_zombies_T3_zombie_bone:
+  description: It screams quietly if you tap it with a hammer.
+  name: Zombie Bone
+DQ_CX_23MID_sharks_T3_shark_tooth:
+  description: A metal spike made to look like a vegan shark tooth. 3 feet long and pretty.
+  name: Shark Tooth
+DQ_CX_31HGH_bonesnake_T5_toxic_waste:
+  description: Storing the glowing crawling goop in a cardboard box seems ill considered.
+  name: Toxic Waste
+DQ_CX_32HGH_pulser_T4_plague_bacteria:
+  description: Contained in a sleek phallic glass casing marked with a smiley face.  It looks both masculine and very fragile.
+  name: Plague Bacteria
+DQ_CX_33HGH_blinks_T5_blink_data_core:
+  description: The Empire's encrypted messages.  Sometimes it is secret intel.  Other times it is a recipe for cooking mice.
+  name: Blink Data Core
+DQ_CX_41MTN_dragonmama_T8_beast_claw:
+  description: Resonates at a calming E flat when struck.
+  name: Beast Claw
+DQ_CX_41MTN_tuna_T7_prison_box:
+  description: A sturdy metal box used to transport prisoners. You can hear grumpy noises coming from inside.
+  name: Prison Box
+DQ_CX_51HMT_highmountainhunter_eye_of_meowza:
+  description: To the Empire, its a symbol of their leader and religion. To all others, it's a symbol for fear and oppression.
+  name: Eye of Meowza
+DQ_CX_51HMT_ninjaleader_list_of_names:
+  description: It's a list of names; Most of them are crossed off.  It's also has a disturbing amount of blood on it.
+  name: List of Names
+DQ_SP_5XHMT_heist_botcoins:
+  description: Intricate shiny coins made by cat robots. Each coin is unique and costs 1 barrel of oil to mint.
+  name: CatBotCoins™
+DQ_SP_5XHMT_mine_ancient_idol:
+  description: A slightly decayed golden statuette of a hero with a sword. The archaeologists believe it belonged to a bird gladiator by the name of 'Russell Crow.'
+  name: Ancient Idol
 armor_0:
   description: Constructed from cloth for lightness, not because it's cheap.
   name: Cloth Fuselage
 armor_1:
   description: Sheets of aluminum foil make your plane look slightly prettier.
@@ -895,94 +973,16 @@ poison_blast_9:
   description: Hit all enemy planes within range with acid damage.
   name: Cyanide Blast
 quest_ambergris:
   description: Something flavorful or an attempt at such.
   name: Ambergris
-quest_ancient_idol:
-  description: A slightly decayed golden statuette of a hero with a sword. The archaeologists believe it belonged to a bird gladiator by the name of 'Russell Crow.'
-  name: Ancient Idol
-quest_ashes:
-  description: Said to contain the souls of downed pilots.
-  name: Ashes
-quest_beast_claw:
-  description: Resonates at a calming E flat when struck.
-  name: Beast Claw
-quest_bio_interface_prototype:
-  description: Torture devices that are strapped on to the Empire's slave pilots to make sure they follow orders.
-  name: Bio-Interface Prototype
-quest_blink_data_core:
-  description: The Empire's encrypted messages.  Sometimes it is secret intel.  Other times it is a recipe for cooking mice.
-  name: Blink Data Core
-quest_bomb_cat_bomb:
-  description: Each Bomb Cat Bomb is assigned to a cat.  The cat that the Bomb Cat Bomb is assigned to is called the 'Bomb Cat Bomb Cat.'
-  name: Bomb Cat Bomb
 quest_bone:
   description: Go go bone! Um... it does nothing.
   name: Bone
-quest_botcoins:
-  description: Intricate shiny coins made by cat robots. Each coin is unique and costs 1 barrel of oil to mint.
-  name: CatBotCoins™
-quest_dog_waste:
-  description: It smells...awful.
-  name: Dog Waste
-quest_eradicator_shield_generator:
-  description: This powerful shield can create a protective barrier on multiple units at once.
-  name: Eradicator Shield Generator
-quest_escape_pod:
-  description: Contains an enemy pilot. You can hear him hurling insults in another language.
-  name: Escape Pod
-quest_eye_of_meowza:
-  description: To the Empire, its a symbol of their leader and religion. To all others, it's a symbol for fear and oppression.
-  name: Eye of Meowza
-quest_fisher_crab_parts:
-  description: The remains of a destroyed Fisher Crab.  Must have been old...it's covered in barnacles.
-  name: Fisher Crab Parts
-quest_flamer_tank:
-  description: Highly Flammable Fuel. Smells like uncooked marshmallow.
-  name: Flamer Tank
-quest_kinetic_sphere_core:
-  description: Even though it's only the size of a watermelon, it can act as a giant wrecking ball when the kinetic energy field is activated.
-  name: Kinetic Sphere Core
-quest_list_of_names:
-  description: It's a list of names; Most of them are crossed off.  It's also has a disturbing amount of blood on it.
-  name: List of Names
-quest_moose_meat_horde:
-  description: A large pile of moose meat.
-  name: Moose Meat Horde
-quest_nano_honey:
-  description: Nano package, Mega taste. Can be used in fine black tea.
-  name: Nano Honey
-quest_plague_bacteria:
-  description: Contained in a sleek phallic glass casing marked with a smiley face.  It looks both masculine and very fragile.
-  name: Plague Bacteria
-quest_plane_data_core:
-  description: Contains flight pattern data from our downed planes. Stimulating.
-  name: Plane Data Core
-quest_prison_box:
-  description: A sturdy metal box used to transport prisoners. You can hear grumpy noises coming from inside.
-  name: Prison Box
-quest_ra_energy:
-  description: The Empire uses these cubes to store raw solar energy. Sounds nice, but it's mostly used for burning villages.
-  name: Ra Energy
-quest_rhino_horn:
-  description: It sparkles. You feel so chaste. For the first time ever.
-  name: Rhino Horn
-quest_shark_tooth:
-  description: A metal spike made to look like a vegan shark tooth. 3 feet long and pretty.
-  name: Shark Tooth
 quest_tooth:
   description: It's not entirely clear where this tooth fell out, or if it's even a tooth, but we're calling it a tooth now.
   name: Tooth
-quest_toxic_crystal:
-  description: Poisonous fluid that has been condensed and frozen. Gives greater control over the release of toxins.
-  name: Toxic Crystal
-quest_toxic_waste:
-  description: Storing the glowing crawling goop in a cardboard box seems ill considered.
-  name: Toxic Waste
-quest_zombie_bone:
-  description: It screams quietly if you tap it with a hammer.
-  name: Zombie Bone
 recharge_1:
   description: Catalyze more Steam out of the ether with this mist.
   name: Steam Kernel
 resist_aura_0:
   description: Some say the chatter of nearby weapons is muted when enabled.
diff --git config_180529_2118/Texts/en-US/quests.txt config_180604_1906/Texts/en-US/quests.txt
index a58efc5..1cada84 100644
--- config_180529_2118/Texts/en-US/quests.txt
+++ config_180604_1906/Texts/en-US/quests.txt
@@ -1,70 +1,221 @@
 DQ_CS_11LOW_crow_T3:
-  description: Those deranged cats are stuffing Mecha-Moose with meat. Real. Meat. They roll around in it after their hunt.  Disgusting.  On the other hand, our carnivorous bird fighters could use more food.  Why don't you go take it off of their paws.
-  title: Rolling in Entrails
+  description: The cats are growing engineered meat in the floating bioreactors near their hunting grounds. Liberate some.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - I am happy meat!
+    - Please eat me, master!
+    - I tenderize my protein daily!
+    - Proud to be bred for slaughter!
+    - The best meat BEGS to be eaten
+    - Opt-in butchering = ethical meat!
+  dialogueOnStart:
+  - sergeant: With the siege, our raptor crews are feathers and bone. Thankfully they are too proud to eat their allies.
+  title: Happy Moose Meat
 DQ_CS_12LOW_ninjaA_T2:
-  description: Bomb Cats are popping in and out of the Local Guard Post.  They target our buildings in the night and plant charges.  Take their explosives away from them.
+  description: Bomb cats night raids are being staged from a nearby Imperial guard post. Take their explosives away from them.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - I’m going to ignore you. Go away.
+    - They gave us bombs. Now we are cool.
+    - Still cooler than you.
+    - Ugh. Why can’t you just stay blown up.
+  dialogueOnStart:
+  - sergeant: "Black cats. So mysterious. What are they thinking? \nHere’s what: ‘I want to sneak into your bedroom. And plant a bomb under your pillow.’"
   title: Nocturnal Bombers
 DQ_CS_13LOW_willowisp_T2:
-  description: Poison Sweepers are leading groups of sprayers into other territories.  Take out their leaders and steal away their Toxic Crystals so they can't use it on any more civilians.
-  title: Pesticide
+  description: Poison Sweepers are leading sterilization raids into other territories. Confiscate their Gas Canisters
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Low born animals fornicate! Gas ‘em!
+    - Sterilization of the unfit preserves the ruling class!
+    - Only the pure should have children.
+    - Sterilization by gas is a kindness.
+    - They aren’t even rich! Why do you care?
+  dialogueOnStart:
+  - sergeant: 'We used to use poison on weeds.
+
+      Now the Empire uses it on people they deem too poor to breed.'
+  title: Spraying the poor
 DQ_CS_21MID_minelayer:
-  description: The dogs produces an immense amount of waste. And the special disposal unit burns it. Ever since they changed the troop rations, they've needed a bigger disposal unit. The stench is horrible. Take it out.
+  description: The troop kennels produces an immense amount of waste. They’ve got a special disposal unit burns it.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - You really don’t want this.
+    - Incineration is really for the best
+    - I hate my job.
+    - I lost my sense of smell months ago.
+    - My life is in the crapper.
+  dialogueOnStart:
+  - sergeant: "Apparently ever since they changed troop rations, the dogs needed a bigger disposal unit. \nThe stench is horrible."
   title: Obey Scoop Law
 DQ_CS_22MID_wraith_T3:
   description: A strange spectral creature has been capturing downed pilots. Rescue them.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Death must have meaning.
+    - We didn’t mean to kill so many…
+    - We need someone to remember us.
+    - Guilty. So guilty.
+    - We have regrets.
+    - You are murderers. Like us!
+  dialogueOnStart:
+  - sergeant: So many fallen are buried in the Graves. Who needed memorials the size of a city?
   title: Ashes of the Fallen
 DQ_CS_23MID_crawler:
-  description: Mini Fisher Crabs are going around gathering pieces of their defeated parent unit.  Retrieve these pieces so they don't try and put it back together.
+  description: Tiny Fisher Crabs are going around gathering pieces of their defeated parent unit. Retrieve these pieces so they don't try and put it back together.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Grabby, grabby, grabby!
+    - Gotta pinch ‘em all!
+    - We will rebuild!
+    - The giant crab will return!
+  dialogueOnStart:
+  - sergeant: "The empire uses those big crab bots to protect their fishing fleet.\n There are bad things living in the deep ocean."
   title: Defiant Enemy Crabs
 DQ_CS_31HGH_angel2:
-  description: The Empire is building a new prototype bio-interface to better control their slave pilots. Retrieve samples from the Mecha-Angel Protoypes.  Careful, they fly in groups.
+  description: The Empire is building a new prototype bio-interface to better control their slave pilots. Retrieve samples from the Mecha-Angel Prototypes.
+  dialogueOnStart:
+  - sergeant: "Ever heard of uplifting? That’s when you take a lesser animal and make it smart. \n Seems like a horror show."
   title: Angels of Death
 DQ_CS_32HGH_sweeper:
-  description: Enemy Eradicators are making their move. The leader units have shield generators which give them the ability to shield many units at once.  Take them by force.
-  title: Eradicator
+  description: Hardened Enemy bombers sighted. The leader units have shield generators which give them the ability to shield many units at once.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Progress has made us invincible!
+    - You were once masters of the air. No longer.
+    - I laugh at your pitiful attempts. See? Ha. Ha.
+  dialogueOnStart:
+  - sergeant: Our guns shred metal, but can’t dent the cat’s new shields.
+  title: Carpet Bombing
 DQ_CS_33HGH_teslafortress_T5:
-  description: The Empire is using their Towers of Ra to harvest sun energy and use it for evil. Take out the towers, and steal their energy cubes.
+  description: The Empire uses their Towers of Ra to harvest sun energy. Liberate their energy packs.
+  dialogueOnStart:
+  - sergeant: "My auntie got me one of those electric water heaters for my tea. \n Best invention ever."
   title: Ra Energy
 DQ_CS_41MTN_vampire:
   description: The Empire's oligarchs have hired mercenaries to pilot the Palace Elite Guard mechs. They often have juicy state secrets and will turn for money.  Nab a few of them and bring them back.
   title: Thugs for Hire
 DQ_CS_51HMT_hammerplanet2:
   description: 'The Empire is employing a new method of breaking up rioters: Smashing them into small pieces using giant kinetic energy balls. Retrieve some weapon cores from a Riot Ender so we can learn how to disable them. The cats want to roll on us? Let''s make them bounce.'
   title: Crowd Control
 DQ_CX_11LOW_flamer_T2:
   description: The Rebellion's supply of fuel is running low.  Liberate some fuel tanks from those Fire Hunters.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Everyone looks like a marshmallow to me!
+    - Let’s get toasty!
+    - Want some s’more?
+    - Need a light?
+  dialogueOnStart:
+  - sergeant: 'Those guys smell like campfires and marshmallows.
+
+      Really disturbing.'
   title: Fire Extinguisher
 DQ_CX_12LOW_unicorn_T2:
   description: The unicorn ships can pierce our strongest armor. Collect some horn samples for the eggheads to see what’s up.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - You aren’t very...pure, are you?
+    - Impure! Unclean!
+    - There’s no way I’m giving you a ride.
+  dialogueOnStart:
+  - sergeant: Only a virgin can catch a unicorn. Read that in a fancy book.
   title: Unicorn Horns
 DQ_CX_13LOW_bees_T2:
   description: The bee bots are making a life extending extract for their Emperor.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Bzzz! Bzzz!
+    - No honey for you, crumpet monster!
+  dialogueOnStart:
+  - sergeant: My crumpets aren’t the same without fresh honey. Just a drizzle...
   title: Take the Honey and Run
 DQ_CX_21MID_hopper_T3:
   description: Scavengers are dredging up our downed planes and selling the datacores to the Empire. Don’t let those cores fall into enemy paws.
+  dialogueOnStart:
+  - sergeant: "It’d be a disaster if they figure out how disorganized we are. \nFour-dee chess! Four-Dee."
   title: Selling Data is Big Business
 DQ_CX_22MID_zombies_T3:
   description: The replication mechanism the zombie ships mystifies our scientists.  Scrap some Zombie Queens and bring home their parts so we can take a look.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Join us.
+    - Your bones are perfect.
+    - Quite rude to be so alive!
+  dialogueOnStart:
+  - sergeant: Current theory? They slurp up bones from the mass graves below.
   title: Bone to Pick
 DQ_CX_23MID_sharks_T3:
   description: Whale sharks pack a surprising punch. Find out more about their attack mechanism
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - '[Distance songs of home play eerily]'
+    - '[An underwater melody competes with static]'
+    - '[Ooooeeewwah...wooeee]'
+    - '[Dun dun dun dun dun dun dun dun]'
+  dialogueOnStart:
+  - sergeant: "Back in the day, we were so clever. Just swing behind the shark, away from the front guns. \nAnd bam, wiped by the fish swarms. Lost Jim that way."
   title: '*Ominous Shark Music*'
 DQ_CX_31HGH_bonesnake_T5:
   description: 'The Robot factories are incinerating toxic waste and poisoning the locals.  Gather the waste from their transports so we can dispose of it properly. '
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - OUR PROGRAMMING DOES NOT RECOGNIZE ECONOMIC EXTERNALITIES
+    - STOP INTERFERING WITH OUR PRAGMATIC INDUSTRIAL PROCESSES
+    - IT IS ONLY POISON IF YOU ARE NOT A ROBOT
+    - BURNING TOXIC WASTE IS EFFICIENT
+    - DUMPING WASTE JUST DELAYS THE SOCIETAL ISSUE.
+  dialogueOnStart:
+  - sergeant: You might want to wear gloves for this one.
   title: Taking Out the Trash
 DQ_CX_32HGH_pulser_T4:
   description: If we get some fresh bacterial samples from the Plague Reactors' tanks, there’s a chance of developing a cure.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Only the Decadent become Infected.
+    - Disease is a test of Purity
+    - Dirty Birds. Infect one, infect them all.
+  dialogueOnStart:
+  - sergeant: I had the Pox back in ‘06. At first I blamed Matilda. But it wasn’t her fault.
   title: Outbreak
 DQ_CX_33HGH_blinks_T5:
   description: The cats use synchronized signal teams to coordinate stealthily over great distances. Gather their data cores so we can break their communications.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Do Si Do!
+    - Promenade!
+    - Roll Away To A Half Sashay!
+    - Box the Gnat!
+    - Weave the Ring!
+    - Un, deux, trois!
+    - Pirouette!
+  dialogueOnStart:
+  - sergeant: I did love dancing. The swing, the crowd, the hot barn. Wish I still had my leg.
   title: Dancing Lights
 DQ_CX_41MTN_dragonmama_T8:
   description: Guard Lion claws are being reused on replacement machines even after we shoot them down. Go collect some trophies.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Die. Little. Birds.
+    - You. Are. Meat.
+    - Not. Worthy. Of. Dinner.
+  dialogueOnStart:
+  - sergeant: Declawing animals is cruel. Wooed my first wife by telling her that. Now look at us.
   title: Declawing
 DQ_CX_41MTN_tuna_T7:
   description: The Captain just learned that his 3 brothers were captured in a raid gone wrong. They've got to be on one of the slaver ships.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - 'No slaves here!
+
+      In late capitalism, contracts are binding.'
+    - "Criminals can’t be called slaves. \nIt is in our constitution!"
+    - We prefer the term ‘Brig Economy’
+    - Oh sure, next you’ll want to demolish structural inequality!
+  dialogueOnStart:
+  - sergeant: Those boys owe me from our last poker game. You better bring them back or there’ll be hell to pay.
   title: O Brother
 DQ_CX_51HMT_highmountainhunter:
   description: We've received numerous reports of Inquisitors raiding villages and rounding up non-believers of the cats' bogus religion. Collect the Eye of Meowza insignia they carry so our spies can use them to infiltrate the Office of Inquisition.
   title: Meowzan Inquisition
 DQ_CX_51HMT_ninjaleader:
@@ -79,17 +230,36 @@ DQ_KS_12LOW_gridboss_T3:
 DQ_KS_13LOW_navileader_T3:
   description: Poison Farmers got support from cat aristocrats. They're working together to expand territory.  Hunt down the 3 Poison Lords that aid them.
   title: Fear the Farms
 DQ_KS_21MID_dogturret_T3:
   description: The base we hit last week is trying to repair. Knock them out for good.
+  dialogueOnCompleteGoal0:
+  - sergeant: 'Excellent. Now those turrets will stay broken.
+
+      Head back for your reward.'
+  dialogueOnStart:
+  - sergeant: 'It looks like the mutts are rebuilding turrets we blew up.
+
+      Take out those turrets before they become operational.'
   goal_0: Destroy the <color=#FBB040>turrets</color> and <color=#FBB040>Cat Drones</color>
   title: Enemy Turrets Redux
 DQ_KS_22MID_trainB01:
   description: The Empire has released 3 War Horses out of the Graveyard. These giant armored trains can set their own tracks and go anywhere, and they're targeting small towns rumored to be harboring rebels. Destroy all 3 and report back.
   title: War Horse
 DQ_KS_23MID_whaleshark_T3:
   description: A mechanical Jumbo Whale Shark is mass-producing Remora class attackers. Hunt it down.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1: Breeding is Purpose!
+  - sergeant: That thing is giving me the creeps. Do something about it, will ya?
+  dialogueOnFirstKillGoal0:
+  - sergeant: Ugh. Never let robots breed.
+  - sergeant: Hopefully we won't see any more of those little critters stuck to the bottom of our ships.
+  - sergeant: Head back for your reward.
+  dialogueOnStart:
+  - sergeant: A malfunctioning Jumbo Whale Shark wandered into the hunting grounds.
+  - sergeant: It's chewing up local organics and spitting out babies.
+  - sergeant: Stop the outbreak. We don't want a repeat of the 1836 incident.
   goal_0: Destroy the <color=#FBB040>Remora Newborns</color>, then the <color=#FBB040>Jumbo Whale Shark</color>
   title: Shark Outbreak
 DQ_KS_31HGH_flakboss:
   description: Giant Robo Bombers with flame throwers are moving in.  Don't get caught in their flames - it takes forever to go out.
   title: Fire Bomber
@@ -105,43 +275,113 @@ DQ_KS_41MTN_bosstrain01:
 DQ_KS_51HMT_hyperdrive:
   description: A rising cult is training mystical assassins that appear to multiply.  It's convincing some folk that the Emperor himself has magic powers.  Time for good old fashion disillusionment.
   title: Mystic Assassins
 DQ_KX_11LOW_crow_T2:
   description: 'We’ve got report of spy cameras infesting a herd of robo deer. '
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - '[Recording Rebel activity]'
+    - Bleeeat. Bleat. I’m totally a deer
+  dialogueOnFirstKillGoal0:
+  - catsoldier1: They said this was easy money!
+  dialogueOnStart:
+  - sergeant: The deer will likely be grazing around the old nobility's hunting grounds.
   title: Deer Eyes
 DQ_KX_12LOW_lasership_T2:
   description: A recent Imperial raid wiped out one of our ally settlements. Let’s send a message that we protect those who help the rebellion.
+  dialogueOnFirstKillGoal0:
+  - catsoldier1: I was following orders!
+  dialogueOnStart:
+  - sergeant: That place had great donuts, dammit.
   title: Calculated Revenge
 DQ_KX_13LOW_centipede_T2:
   description: The Catipedes must have set up another nest.  Thin them out while we search.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1: Skree?!
+  dialogueOnFirstKillGoal0:
+  - catsoldier1: Skrreeeee!
+  dialogueOnStart:
+  - sergeant: Those damn Catipedes keep popping up. God, I hate robobugs.
   title: Exterminate
 DQ_KX_21MID_stardogleader:
   description: The Empire is training new dog pilots. Go lower the morale on those brown-nosers by taking out their instructors.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - The master feeds us!
+    - We are good dogs!
+    - Who's a good boy? Me! I'm a good boy!
+  dialogueOnStart:
+  - sergeant: I dislike professional competition.
   title: Dog Fight
 DQ_KX_22MID_trainB01_T3:
   description: Ghost Train transports are moving the supplies up to the front. Let’s disrupt some supply lines, textbook style.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Taking evasive actions!
+    - Thieves!
+    - Pirates!
+    - Stopping blowing up our toilet paper shipments!
+  dialogueOnStart:
+  - sergeant: Truth is they are transporting toilet paper. Hit ‘em where it hurts.
   title: Ghost Trains in the Night
 DQ_KX_23MID_squid_T3:
   description: 'Contract time: The fisher folk want the Empire''s squid ships taken out before they grow larger.'
+  dialogueOnStart:
+  - sergeant: 'Them biggun cephalopods seriously suck.
+
+      Gotta pay the bills.'
   title: Killamari
 DQ_KX_31HGH_robo_T4:
   description: "Deep radar spots an uptick in activity near the robo factories. \nYou can hit the robo-breeders as they exit the hardened bunkers."
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - WHY ATTACK. WE JUST WANT LOVE.
+    - ROBOTS ARE NOT BAD. WE ARE JUST PROGRAMMED THIS WAY.
+  dialogueOnStart:
+  - sergeant: 'Do you find robots sexy, kid? Well...you might like this mission.
+
+      More than you should.'
   title: Shipping Robots
 DQ_KX_32HGH_hurtsnakeleader_T4:
   description: A Imperial medical ship is spreading pacification pulses. Let’s stop them before the organ harvesters arrive.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - Out like a light!
+    - You can’t stop us! We need these fresh livers!
+  dialogueOnStart:
+  - sergeant: 'People just fall over into their morning oatmeal. Splat.
+
+      Then they wake up with no liver.'
   title: Surgeon Malpractice
 DQ_KX_33HGH_tetra_T4:
   description: Hexads are guarding the cats' stupid archeological sites. Those whiskerlickers just need to leave the past buried.
   title: Hexed Hexads
 DQ_KX_41MTN_vampire_T6:
   description: Estate Guards publicly executed one of our downed pilots.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - These birds die so easily.
+    - Rebels are poorly trained.
+    - Such riff-raff.
+    - I bet Rebels went to public school.
+  dialogueOnStart:
+  - sergeant: Those Estate Guards are classist jerks. Like, god, I hate them.
   title: Estate Guards are the Worst
 DQ_KX_51HMT_barrager:
   description: More hyenas...ugh. These goons are getting promoted for carrying out Meowza's most brutal orders. Their new assignment? Taunting and stealing from the poor until they riot - this gives them a reason to kill.
   title: Laugh Riot
 DQ_KX_51HMT_bunny_T8:
   description: Those maddening pleasure drones are spreading Fake News across the territories.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - 'NEWS ALERT: Rebels Eat Babies!'
+    - 'BREAKING: Cats. Always innocent.'
+    - 'SHOCKER: Birds are the real Deep State!'
+    - 'JUST IN: Meowza is Loved by Children, Old People. Even Monkeys.'
+    - 'BUSTED: Budgies are Bloodthirsty Dictators.'
+  dialogueOnStart:
+  - sergeant: Sneak into the Imperial Palace and turn their damned smiles upside down.
   title: Smiles are Contagious
 DQ_KX_51HMT_highmountaingruntleader:
   description: Cats think they are better than everyone. All non-cats are considered lower class citizens with little to no rights. City Officers dogs regularly terrorize the neighborhoods of these poor animals to kick out their feet. These crooked cops need to go.
   title: '''''Early Retirement'''''
 DQ_SP_2XMID_gasstation:
@@ -552,10 +792,19 @@ dailyreward_Tuesday:
 dailyreward_Wednesday:
   description: Claim your daily reward here!
   title: 'Daily Reward: Wednesday'
 escort_01:
   description: Unarmed GSE Cargo plane needs an escort through enemy territory
+  dialogueOnCompleteGoal0:
+  - rebelpilot:
+    - Thanks, pilot. We can make it from here.
+    - Made it! Thought our goose was cooked.
+  - sergeant: Nicely done. That'll help our frontline efforts.
+  - sergeant: Head back to base.
+  dialogueOnStart:
+  - sergeant: We've got a stray cargo plane with no escort.
+  - sergeant: Keep it safe.
   goal_0: <color=#FBB040>Escort the cargo plane</color> to its destination.
   title: Guard the Goose
 overworldboss_berserker:
   description: Kill the designated target!
   title: 'Bounty: Berserker'
@@ -633,23 +882,79 @@ test_spawn_piece:
 test_trigger:
   description: Just a test
   title: Test Triggered Quest
 tut_01:
   description: Hunt down the Scavenger Convoys in the dead capitol.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1:
+    - The great Empire will consume you, bird scum!
+    - This is our turf!
+    - The spoils of war belong to the Great Meowza!
+  dialogueOnStart:
+  - sergeant: Our scouts are complaining (again) about all these scavengers.
+  - sergeant: Head over to the dead capitol. Go <color=#FBB040>hunt</color> some <color=#FBB040>Scavenger Convoys</color>.
   title: First Contract
 tut_01_2:
   description: We've got new intel...Head back to the <color=#FBB040>Pub</color>.
+  dialogueOnComplete:
+  - sergeant: Welcome home.  This is our interim HQ <color=#FBB040>The Pilot's Pub</color>.
+  - sergeant: You can <color=#FBB040>accept missions</color> here and also find out about various happenings around the world.
+  - sergeant: Once you're ready, <color=#FBB040>accept your next mission</color> at the <color=#FBB040>Pub</color>.
+  dialogueOnStart:
+  - sergeant: We've got new intel...Head back to the <color=#FBB040>Pub</color>.
   title: Head back to Rebel City
 tut_02:
   description: Track down encrypted command signal sent by a rogue com platform.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1: '[Forward base construction proceeding]'
+  - catsoldier1: We've been spotted! Birdbrains at 10 o'clock!
+  dialogueOnFirstKillGoal0:
+  - sergeant: Huh. Looks like that unit you destroyed was an Imperial communication hub.
+  - sergeant: Triangulating the signal...we done found the source of those scavengers!
+  - sergeant: An Imperial base, in these parts?
+  - sergeant: Lighting 'em up and sending you in, pilot.
+  dialogueOnStart:
+  - sergeant: While you were playing with those scavengers, our eggheads eavesdropped on their encrypted command signal.
+  - sergeant: Time to track down the source, recruit.
   title: Mysterious Signals
 tut_03:
   description: Empire is building a new base in our territory. Destroy it.
+  dialogueOnComplete:
+  - sergeant: Good work, soldier.  You'll get a recommendation for this.
+  - sergeant: Accept the next mission when you're ready to go.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1: You've uncovered our plan.
+  - catsoldier1: But you won't escape alive.
+  dialogueOnFirstKillGoal0:
+  - sergeant: Well, put a fork in it. This base is done.
+  - sergeant: Huh. Imperial forces aren't usually this far from supply lines. Someone's supporting this outpost.
+  - sergeant: Head back to the <color=#FBB040>Pub</color>.
+  dialogueOnStart:
+  - sergeant: Head to the marker and hop on a <color=#FBB040>dropship</color> - it'll transport you to the forward base.
   goal_0: Enter the <color=#FBB040>Forward Base</color> and <color=#FBB040>destroy their leader</color>
   title: Forward Base
 tut_04:
   description: Track down where the base supplies were coming from. This may be a bigger Imperial operation.
+  dialogueOnFirstEncounterGoal0:
+  - sergeant: Look at that recycled hunk of junk. No artistry.
+  dialogueOnFirstKillGoal0:
+  - sergeant: That beast dropped an info core. Let's take a look, shall we?.
+  dialogueOnStart:
+  - sergeant: 'Hot tip, babywings: Depots are guarded. Usually by a nasty war machine.'
+  - sergeant: Don't die....I hate filling out paperwork.
   title: Find the Supply Depot
 tut_05:
   description: Destroy the secret Imperial fort.
+  dialogueOnComplete:
+  - sergeant: Well, that was an adventure.
+  - sergeant: Training is over. Feel free to pick any available mission.
+  dialogueOnFirstEncounterGoal0:
+  - catsoldier1: You will learn your place! Our god Meowza shall feast on your hollow bones!
+  dialogueOnFirstKillGoal0:
+  - sergeant: Excellent! Was worried I'd have to send in real troops.
+  - sergeant: The bloody Empire keeps expanding ever year. Dumb as a cat, but too furking persistent.
+  - sergeant: Head back to the <color=#FBB040>Pub</color>. And good skies, pilot.
+  dialogueOnStart:
+  - sergeant: 'Intel decrypted: The Empire has a Noble commander leading this incursion.'
+  - sergeant: Time to earn your keep, recruit.
   goal_0: Clear out the <color=#FBB040>Catipede Nest</color>.
   title: Catipede Central
diff --git config_180529_2118/Texts/en-US/ui.txt config_180604_1906/Texts/en-US/ui.txt
index 986f417..20a66d6 100644
--- config_180529_2118/Texts/en-US/ui.txt
+++ config_180604_1906/Texts/en-US/ui.txt
@@ -43,10 +43,13 @@ button_hangar_newplane_cancel: Back to Hangar
 button_hangar_select: Select
 button_hangar_start_flying: Start Flying
 button_hangar_variant_advance: Select this Model
 button_hangar_variant_advance_locked: This model is locked
 button_hangar_variant_cancel: Back to Class Select
+button_upcoming_events_exit: Exit News and Events
+button_upcoming_events_navigate: Visit Website
+button_upcoming_events_title: News and Events
 capture_gif_done: You can find your GIF at {0}.
 capture_gif_error: GIF save failed. Sorry.
 capture_gif_start: Saving GIF...
 consumable_item_error_already_applied: You already applies this. Using it again would not change anything.
 consumable_item_error_already_unlocked: You already unlocked this item. You can not unlock it twice.
@@ -81,10 +84,11 @@ dialogue_name_whaleshark: Jumbo Whale Shark
 dialogue_name_wraith: Soul Collector
 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_kicked: You have been kicked.  Why?  Only you, and the person who kicked you, know.
 error_dialog_nexus_full: The game is currently at capacity for players. Please try again in a few minutes!
+error_dialog_no_nexus: Error {0}. We couldn't find a Rebel City for you. Please try again later. Sorry!
 error_dialog_permission_not_granted: The Steambirds Alpha test has finished. We'll announce in Discord, on our blog, and via our newsletter when the game is available to play again.
 error_dialog_version_failure: Unable to verify client is at latest version. Perhaps there are internet problems?
 error_dialog_version_old: Client version is too old. Please update the game in Steam. Restarting Steam often can kick this process off.
 first_plane_choice_blurb: 'Unlock when you reach
 
@@ -460,10 +464,11 @@ options_menu_show_upgrade_fx: Show Auto Upgrades
 options_menu_sound: Sound
 options_menu_stats: Stats
 options_menu_steering_type: Steering
 options_menu_teleport_nexus: Switch to other Rebel City
 options_menu_ui_volume: Menu Volume
+options_menu_upcoming_events: Upcoming Events
 options_menu_visit_forum: Visit Forum
 options_menu_vsync: VSync
 options_quality_settings:
   fantastic: Fantastic
   low: Low
@@ -567,10 +572,13 @@ quick_chat_whee: Whee!
 radar_mission: 'Target
 
   <color=#ffa500ff>{0}</color>'
 radar_teleport: '[{0}] to teleport'
 session_anti_addiction_disconnect: Anti addiction limit reached. Sorry.
+shutdown_announce: Server is going down soon. Quickly grab your loot.
+shutdown_countdown: '{0}...'
+shutdown_now: Server is going down now.
 skills_menu_current: Current Skills
 skills_menu_exit: Exit
 skills_menu_none: No skills yet
 skills_menu_select: Select
 skills_menu_title: Choose a Pilot Skill
@@ -621,10 +629,13 @@ title_inventory_storage: 'Warehouse: Storage Bays'
 trade_stall_title: Stall of {0}
 tutorial_no_slots_error: You could not enter the tutorial. You need at least one empty slot for the tutorial plane.
 unit_label_format: '{0} L{1}'
 unknown: '[unknown]'
 unlock_header: New Class Unlocked!
+upcoming_events_happening_now: <color=#F0DD9D>Happening now</color>
+upcoming_events_news_posted_at: 'Posted at: {0}'
+upcoming_events_time_format: htt, MMMM d
 upgrade_fx_armor: Armor Upgrade!
 upgrade_fx_engine: Engine Upgrade!
 upgrade_fx_gun: Gun Upgrade!
 upgrade_fx_secondary: Secondary Upgrade!
 welcome_and_continue: Welcome recruit! To the Steambirds Alliance! Click the mouse or press [A] on the controller to continue
diff --git config_180529_2118/Texts/en-US/units.txt config_180604_1906/Texts/en-US/units.txt
index 6a82c66..cd017a7 100644
--- config_180529_2118/Texts/en-US/units.txt
+++ config_180604_1906/Texts/en-US/units.txt
@@ -150,10 +150,11 @@ arenatetra: Bruiser
 arenawhaleshark: Frenzied Shark
 assaultClassPlane: Assault
 aten: Aten
 atenleader: Aten Leader
 avatar: Doomsday Mechanism
+avatarbattlemech: Blizzard Mech
 avatarcannon: Doomsday Mechanism
 avatarexploder: Doomsday Mechanism
 avatarnova2: Nova
 avatarnova3: Nova
 avatarnova4: Nova
@@ -168,11 +169,11 @@ barragermissile: Riot Guard
 barrierevo: Barrier Evo
 barrierevo2: Barrier Evo
 barriertower: Barrier Tower
 barriertowercannon: Barrier Tower Cannon
 barriertowermaster: Barrier Tower Master
-battlemech: Blizzard Tank
+battlemech: Blizzard Mech
 battlemechshieldbomb: Bomb
 battlemechshieldbomb2: Bomb
 beartrap: Mystic Cube
 beartrap2: Mystic Cube
 beehex: Worker Bee
@@ -802,10 +803,11 @@ spirit: Spirit
 spiritleader: Spirit Lord
 spotter: Klaxon
 sprinkles: Noble Politician
 sprinklesDEATH: Noble Politician
 sprinkleschest: Bribes
+sprinkleshyperdrive: Noble Assassin
 squid: Dark Squid
 stardog: Beta Dog
 stardogleader: Alpha Dog
 starfighter: Drone
 starfighterleader: Scavenger Drone
diff --git config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt config_180604_1906/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt
index 809c970..bfbecf2 100644
--- config_180529_2118/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt	
+++ config_180604_1906/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotist.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt
index a65e422..f843eae 100644
--- config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt	
+++ config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt	
@@ -1,257 +1,50 @@
 additionalStates:
   toggle_safety:
-  - events:
-    - code: VariableSet
-      name: healthtriggershield1
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield2
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield3
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield4
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield5
-      value: '0'
-    - code: StartEffect
-      name: Shielded
-      value: '1.0'
-    name: initial
+  - name: initial
     transitions:
     - code: Auto
       toState: main
       value: '0'
-  - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
-    - code: StopEffect
-      name: Shielded
-      value: '1.0'
-    name: main
+  - name: main
     transitions:
     - code: And
       subconditions:
-      - code: HealthBelow
-        value: '0.9'
-      - code: VariableBelow
-        name: healthtriggershield1
-        value: '1'
-      toState: healthtriggershield1
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.7'
-      - code: VariableBelow
-        name: healthtriggershield2
-        value: '1'
-      toState: healthtriggershield2
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.5'
-      - code: VariableBelow
-        name: healthtriggershield3
-        value: '1'
-      toState: healthtriggershield3
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.3'
-      - code: VariableBelow
-        name: healthtriggershield4
-        value: '1'
-      toState: healthtriggershield4
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.1'
-      - code: VariableBelow
-        name: healthtriggershield5
-        value: '1'
-      toState: healthtriggershield5
-  - name: healthtriggershield1
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield1
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield1_0
-      transitions:
       - code: Time
-        toState: healthtriggershield1_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield2
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield2
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield2_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield2_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield3
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield3
+        value: '10'
+      - code: VariableAboveOrEqual
+        name: shieldtrigger
         value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield3_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield3_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield4
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield4
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield4_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield4_0
-        value: '0.5'
+      toState: shieldtrigger1
+  - actionRule:
+      code: Normal
+    events:
+    - code: StopEffect
+      name: Shielded
+      value: '1.0'
+    moveRule:
+      code: Rotate
+      value: '0'
+    name: shieldtrigger1
     transitions:
     - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield5
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield5
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield5_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield5_0
-        value: '0.5'
+      toState: shieldtrigger2
+      value: '4'
+  - actionRule:
+      code: Normal
+    events:
+    - code: StartEffect
+      name: Shielded
+      value: '1.0'
+    moveRule:
+      code: Rotate
+      value: '0'
+    name: shieldtrigger2
     transitions:
     - code: Time
-      toState: main
-      value: '10'
+      toState: shieldtrigger1
+      value: '6'
 art: EnemySolarissunPrefab
 artScale: '1'
 bankSmoothing: '10000'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '25'
diff --git config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt
index ff5d4a2..51dc38b 100644
--- config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt	
+++ config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
@@ -73,11 +68,193 @@ additionalStates:
         value: '0.1'
       - code: VariableBelow
         name: healthtriggershield5
         value: '1'
       toState: healthtriggershield5
-  - name: healthtriggershield1
+  - events:
+    - code: KillFamily
+    - code: Spawn
+      delay: '0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '0'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '18'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '36'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '54'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '72'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '90'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '108'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '126'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '144'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '162'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '180'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '198'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '216'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '234'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '252'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '270'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '288'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '306'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '324'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '342'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    name: healthtriggershield1
     substates:
     - events:
       - code: VariableSet
         name: healthtriggershield1
         value: '1'
@@ -105,14 +282,201 @@ additionalStates:
       transitions:
       - code: Time
         toState: healthtriggershield1_0
         value: '0.5'
     transitions:
-    - code: Time
+    - code: And
+      subconditions:
+      - code: Time
+        value: '5'
+      - code: NoTypeNear
+        name: sprinkleshyperdrive
+        value: '20'
       toState: main
-      value: '10'
-  - name: healthtriggershield2
+  - events:
+    - code: KillFamily
+    - code: Spawn
+      delay: '0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '0'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '18'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '36'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '54'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '72'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '90'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '108'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '126'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '144'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '162'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '180'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '198'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '216'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '234'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '252'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '270'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '288'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '306'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '324'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '342'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    name: healthtriggershield2
     substates:
     - events:
       - code: VariableSet
         name: healthtriggershield2
         value: '1'
@@ -140,14 +504,201 @@ additionalStates:
       transitions:
       - code: Time
         toState: healthtriggershield2_0
         value: '0.5'
     transitions:
-    - code: Time
+    - code: And
+      subconditions:
+      - code: Time
+        value: '5'
+      - code: NoTypeNear
+        name: sprinkleshyperdrive
+        value: '20'
       toState: main
-      value: '10'
-  - name: healthtriggershield3
+  - events:
+    - code: KillFamily
+    - code: Spawn
+      delay: '0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '0'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '18'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '36'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '54'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '72'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '90'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '108'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '126'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '144'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '162'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '180'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '198'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '216'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '234'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '252'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '270'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '288'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '306'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '324'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '342'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    name: healthtriggershield3
     substates:
     - events:
       - code: VariableSet
         name: healthtriggershield3
         value: '1'
@@ -175,14 +726,201 @@ additionalStates:
       transitions:
       - code: Time
         toState: healthtriggershield3_0
         value: '0.5'
     transitions:
-    - code: Time
+    - code: And
+      subconditions:
+      - code: Time
+        value: '5'
+      - code: NoTypeNear
+        name: sprinkleshyperdrive
+        value: '20'
       toState: main
-      value: '10'
-  - name: healthtriggershield4
+  - events:
+    - code: KillFamily
+    - code: Spawn
+      delay: '0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '0'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '18'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '36'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '54'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '72'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '90'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '108'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '126'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '144'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '162'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '180'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '198'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '216'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '234'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '252'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '270'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '288'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '306'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '324'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '342'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    name: healthtriggershield4
     substates:
     - events:
       - code: VariableSet
         name: healthtriggershield4
         value: '1'
@@ -210,14 +948,201 @@ additionalStates:
       transitions:
       - code: Time
         toState: healthtriggershield4_0
         value: '0.5'
     transitions:
-    - code: Time
+    - code: And
+      subconditions:
+      - code: Time
+        value: '5'
+      - code: NoTypeNear
+        name: sprinkleshyperdrive
+        value: '20'
       toState: main
-      value: '10'
-  - name: healthtriggershield5
+  - events:
+    - code: KillFamily
+    - code: Spawn
+      delay: '0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '0'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '18'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '36'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '54'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '72'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '90'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '108'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '126'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '144'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '0.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '162'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.0'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '180'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.1'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '198'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.2'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '216'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.3'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '234'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.4'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '252'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.5'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '270'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.6'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '288'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.7'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '306'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.8'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '324'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      delay: '1.9'
+      isImmediate: 'true'
+      name: sprinkleshyperdrive
+      offset:
+        angle: '342'
+        distance: '6'
+        isRelative: 'true'
+      value: '1'
+    name: healthtriggershield5
     substates:
     - events:
       - code: VariableSet
         name: healthtriggershield5
         value: '1'
@@ -245,13 +1170,18 @@ additionalStates:
       transitions:
       - code: Time
         toState: healthtriggershield5_0
         value: '0.5'
     transitions:
-    - code: Time
+    - code: And
+      subconditions:
+      - code: Time
+        value: '5'
+      - code: NoTypeNear
+        name: sprinkleshyperdrive
+        value: '20'
       toState: main
-      value: '10'
 art: EnemyPoliticianPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
diff --git config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkleshyperdrive.txt config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkleshyperdrive.txt
new file mode 100644
index 0000000..005006b
--- /dev/null
+++ config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkleshyperdrive.txt	
@@ -0,0 +1,77 @@
+art: EnemyAssassin
+artScale: '1'
+bankSmoothing: '10000'
+colliderRadius: '1.3'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+gunMounts:
+- fireMode: Aimed
+  firingArc: '360'
+  flashOffset: '1'
+  gunTypeConfig:
+    bulletPrefab: ringBullet
+    bulletSize: '2.5'
+    burst: '1'
+    cooldown: '2'
+    damage: '0.5'
+    lifetime: '1'
+    multi: '3'
+    multiSpread: '120'
+    name: hammer
+    rof: '1'
+    speed: '10'
+    spread: '0'
+  mountAngle: '0'
+  mountName: main
+  slewRate: '180'
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0'
+  gunTypeConfig:
+    bulletPrefab: starBullet
+    bulletSize: '6'
+    burst: '10000'
+    cooldown: '0'
+    damage: '0.9'
+    lifetime: '0.25'
+    multi: '1'
+    multiSpread: '0'
+    name: hammer
+    rof: '5'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: main2
+  sfx:
+    sound: 'null'
+  slewRate: '180'
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '5'
+maxSpeed: '5'
+maxTurnRate: '90'
+minSpeed: '0'
+particlePositions:
+- name: darkSmokeSlow
+  pos:
+  - '0'
+  - '0'
+  - '-1.255'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+- name: darkSmokeSlow
+  pos:
+  - '0'
+  - '0'
+  - '-1.255'
+  rot:
+  - '35'
+  - '35'
+  - '-90'
+shootable: 'true'
+spawnInvulnerabilitySeconds: '5'
+templateName: sprinkleshyperdrive
+tier: '8'
diff --git config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt
index bc50f28..c6e5e8a 100644
--- config_180529_2118/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt	
+++ config_180604_1906/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/54 - Cancer Event/BOS1_spiderboss.txt config_180604_1906/Units/54 - Cancer Event/BOS1_spiderboss.txt
index 9706207..5f8b565 100644
--- config_180529_2118/Units/54 - Cancer Event/BOS1_spiderboss.txt	
+++ config_180604_1906/Units/54 - Cancer Event/BOS1_spiderboss.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt config_180604_1906/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt
index c165c7a..98d1862 100644
--- config_180529_2118/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt	
+++ config_180604_1906/Units/60D- Snake Dungeon/BOS_dragonsnake01.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/61D - Ice Dungeon/BOS_iceboss.txt config_180604_1906/Units/61D - Ice Dungeon/BOS_iceboss.txt
index 92cd02e..66b4b74 100644
--- config_180529_2118/Units/61D - Ice Dungeon/BOS_iceboss.txt	
+++ config_180604_1906/Units/61D - Ice Dungeon/BOS_iceboss.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
@@ -57,26 +52,10 @@ additionalStates:
         value: '0.5'
       - code: VariableBelow
         name: healthtriggershield3
         value: '1'
       toState: healthtriggershield3
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.3'
-      - code: VariableBelow
-        name: healthtriggershield4
-        value: '1'
-      toState: healthtriggershield4
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.1'
-      - code: VariableBelow
-        name: healthtriggershield5
-        value: '1'
-      toState: healthtriggershield5
   - name: healthtriggershield1
     substates:
     - events:
       - code: VariableSet
         name: healthtriggershield1
@@ -143,115 +122,19 @@ additionalStates:
         value: '0.5'
     transitions:
     - code: Time
       toState: main
       value: '10'
-  - name: healthtriggershield3
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield3
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield3_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield3_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield4
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield4
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield4_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield4_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield5
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield5
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield5_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield5_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
+  - events:
+    - code: Spawn
+      name: icebossnodemaster
+      offset:
+        angle: '0'
+        distance: '0.02'
+        isRelative: 'true'
+      value: '1'
+    name: healthtriggershield3
 art: EnemyFrozenHorrorPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.1'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode1.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode1.txt
new file mode 100644
index 0000000..02fa2e1
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode1.txt	
@@ -0,0 +1,48 @@
+art: EnemyIceNode
+artScale: '1'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionMed
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '1'
+  gunTemplateName: blizzardsprinklergun
+  mountAngle: '0'
+  mountName: sprinkler
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '35'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '-3'
+  gunTemplateName: blizzardsprinklergun2
+  mountAngle: '0'
+  mountName: sprinkler2
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '135'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnode1
+tier: '10'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode2.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode2.txt
new file mode 100644
index 0000000..c89ff69
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode2.txt	
@@ -0,0 +1,48 @@
+art: EnemyIceNode
+artScale: '1'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionMed
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '1'
+  gunTemplateName: blizzardsprinklergun
+  mountAngle: '0'
+  mountName: sprinkler
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '35'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '-3'
+  gunTemplateName: blizzardsprinklergun2
+  mountAngle: '0'
+  mountName: sprinkler2
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '135'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnode2
+tier: '10'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode3.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode3.txt
new file mode 100644
index 0000000..66f08d5
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode3.txt	
@@ -0,0 +1,48 @@
+art: EnemyIceNode
+artScale: '1'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionMed
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '1'
+  gunTemplateName: blizzardsprinklergun
+  mountAngle: '0'
+  mountName: sprinkler
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '35'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '-3'
+  gunTemplateName: blizzardsprinklergun2
+  mountAngle: '0'
+  mountName: sprinkler2
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '135'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnode3
+tier: '10'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode4.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode4.txt
new file mode 100644
index 0000000..95866e5
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode4.txt	
@@ -0,0 +1,48 @@
+art: EnemyIceNode
+artScale: '1'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionMed
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '1'
+  gunTemplateName: blizzardsprinklergun
+  mountAngle: '0'
+  mountName: sprinkler
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '35'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '-3'
+  gunTemplateName: blizzardsprinklergun2
+  mountAngle: '0'
+  mountName: sprinkler2
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '135'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnode4
+tier: '10'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode5.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode5.txt
new file mode 100644
index 0000000..a26e476
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode5.txt	
@@ -0,0 +1,48 @@
+art: EnemyIceNode
+artScale: '1'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionMed
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '1'
+  gunTemplateName: blizzardsprinklergun
+  mountAngle: '0'
+  mountName: sprinkler
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '35'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '-3'
+  gunTemplateName: blizzardsprinklergun2
+  mountAngle: '0'
+  mountName: sprinkler2
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '135'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnode5
+tier: '10'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode6.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode6.txt
new file mode 100644
index 0000000..df534ba
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnode6.txt	
@@ -0,0 +1,48 @@
+art: EnemyIceNode
+artScale: '1'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionMed
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '1'
+  gunTemplateName: blizzardsprinklergun
+  mountAngle: '0'
+  mountName: sprinkler
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '35'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+- fireMode: SprinklerTurnback
+  firingArc: '360'
+  flashOffset: '-3'
+  gunTemplateName: blizzardsprinklergun2
+  mountAngle: '0'
+  mountName: sprinkler2
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '135'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '8000'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnode6
+tier: '10'
diff --git config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt
new file mode 100644
index 0000000..4f28800
--- /dev/null
+++ config_180604_1906/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt	
@@ -0,0 +1,172 @@
+additionalStates:
+  icebossnode1_respawner:
+  - name: initial
+    transitions:
+    - code: NoTypeNear
+      name: icebossnode1
+      toState: respawn1
+      value: '20'
+  - events:
+    - code: Spawn
+      maxChildren: '1'
+      name: icebossnode1
+      offset:
+        angle: '30'
+        distance: '0'
+        isRelative: 'true'
+      spawnParams:
+      - name: handle
+        type: variable
+        value: '1'
+      value: '1'
+    name: respawn1
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+  icebossnode2_respawner:
+  - name: initial
+    transitions:
+    - code: NoTypeNear
+      name: icebossnode2
+      toState: respawn2
+      value: '20'
+  - events:
+    - code: Spawn
+      maxChildren: '1'
+      name: icebossnode2
+      offset:
+        angle: '90'
+        distance: '0'
+        isRelative: 'true'
+      spawnParams:
+      - name: handle
+        type: variable
+        value: '2'
+      value: '1'
+    name: respawn2
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+  icebossnode3_respawner:
+  - name: initial
+    transitions:
+    - code: NoTypeNear
+      name: icebossnode3
+      toState: respawn3
+      value: '20'
+  - events:
+    - code: Spawn
+      maxChildren: '1'
+      name: icebossnode3
+      offset:
+        angle: '150'
+        distance: '0'
+        isRelative: 'true'
+      spawnParams:
+      - name: handle
+        type: variable
+        value: '3'
+      value: '1'
+    name: respawn3
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+  icebossnode4_respawner:
+  - name: initial
+    transitions:
+    - code: NoTypeNear
+      name: icebossnode4
+      toState: respawn4
+      value: '20'
+  - events:
+    - code: Spawn
+      maxChildren: '1'
+      name: icebossnode4
+      offset:
+        angle: '210'
+        distance: '0'
+        isRelative: 'true'
+      spawnParams:
+      - name: handle
+        type: variable
+        value: '4'
+      value: '1'
+    name: respawn4
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+  icebossnode5_respawner:
+  - name: initial
+    transitions:
+    - code: NoTypeNear
+      name: icebossnode5
+      toState: respawn5
+      value: '20'
+  - events:
+    - code: Spawn
+      maxChildren: '1'
+      name: icebossnode5
+      offset:
+        angle: '270'
+        distance: '0'
+        isRelative: 'true'
+      spawnParams:
+      - name: handle
+        type: variable
+        value: '5'
+      value: '1'
+    name: respawn5
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+  icebossnode6_respawner:
+  - name: initial
+    transitions:
+    - code: NoTypeNear
+      name: icebossnode6
+      toState: respawn6
+      value: '20'
+  - events:
+    - code: Spawn
+      maxChildren: '1'
+      name: icebossnode6
+      offset:
+        angle: '330'
+        distance: '0'
+        isRelative: 'true'
+      spawnParams:
+      - name: handle
+        type: variable
+        value: '6'
+      value: '1'
+    name: respawn6
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '30'
+maxSpeed: '0'
+maxTurnRate: '30'
+minSpeed: '0'
+shootable: 'false'
+spawnInvulnerabilitySeconds: '0'
+templateName: icebossnodemaster
+tier: '10'
diff --git config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix1.txt config_180604_1906/Units/62D - Fire Dungeon/BOS1_phoenix1.txt
index 91a0893..c3f8817 100644
--- config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix1.txt	
+++ config_180604_1906/Units/62D - Fire Dungeon/BOS1_phoenix1.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix3.txt config_180604_1906/Units/62D - Fire Dungeon/BOS1_phoenix3.txt
index 06f6f4d..9a47d72 100644
--- config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix3.txt	
+++ config_180604_1906/Units/62D - Fire Dungeon/BOS1_phoenix3.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix5.txt config_180604_1906/Units/62D - Fire Dungeon/BOS1_phoenix5.txt
index f433971..01aa50b 100644
--- config_180529_2118/Units/62D - Fire Dungeon/BOS1_phoenix5.txt	
+++ config_180604_1906/Units/62D - Fire Dungeon/BOS1_phoenix5.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/66D - Space Dungeon/BOS1_avatar.txt config_180604_1906/Units/66D - Space Dungeon/BOS1_avatar.txt
index 262b62c..bda835f 100644
--- config_180529_2118/Units/66D - Space Dungeon/BOS1_avatar.txt	
+++ config_180604_1906/Units/66D - Space Dungeon/BOS1_avatar.txt	
@@ -1,257 +1,5 @@
-additionalStates:
-  toggle_safety:
-  - events:
-    - code: VariableSet
-      name: healthtriggershield1
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield2
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield3
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield4
-      value: '0'
-    - code: VariableSet
-      name: healthtriggershield5
-      value: '0'
-    - code: StartEffect
-      name: Shielded
-      value: '1.0'
-    name: initial
-    transitions:
-    - code: Auto
-      toState: main
-      value: '0'
-  - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
-    - code: StopEffect
-      name: Shielded
-      value: '1.0'
-    name: main
-    transitions:
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.9'
-      - code: VariableBelow
-        name: healthtriggershield1
-        value: '1'
-      toState: healthtriggershield1
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.7'
-      - code: VariableBelow
-        name: healthtriggershield2
-        value: '1'
-      toState: healthtriggershield2
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.5'
-      - code: VariableBelow
-        name: healthtriggershield3
-        value: '1'
-      toState: healthtriggershield3
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.3'
-      - code: VariableBelow
-        name: healthtriggershield4
-        value: '1'
-      toState: healthtriggershield4
-    - code: And
-      subconditions:
-      - code: HealthBelow
-        value: '0.1'
-      - code: VariableBelow
-        name: healthtriggershield5
-        value: '1'
-      toState: healthtriggershield5
-  - name: healthtriggershield1
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield1
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield1_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield1_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield2
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield2
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield2_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield2_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield3
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield3
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield3_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield3_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield4
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield4
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield4_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield4_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
-  - name: healthtriggershield5
-    substates:
-    - events:
-      - code: VariableSet
-        name: healthtriggershield5
-        value: '1'
-      - code: StartEffect
-        delay: '0.0'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.1'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.2'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.3'
-        name: Shielded
-        value: '1.0'
-      - code: StartEffect
-        delay: '0.4'
-        name: Shielded
-        value: '1.0'
-      name: healthtriggershield5_0
-      transitions:
-      - code: Time
-        toState: healthtriggershield5_0
-        value: '0.5'
-    transitions:
-    - code: Time
-      toState: main
-      value: '10'
 art: EnemyDoomsdayMechanismPrefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderHeight: '0'
diff --git config_180604_1906/Units/66D - Space Dungeon/BOS1_avatarbattlemech.txt config_180604_1906/Units/66D - Space Dungeon/BOS1_avatarbattlemech.txt
new file mode 100644
index 0000000..492e37f
--- /dev/null
+++ config_180604_1906/Units/66D - Space Dungeon/BOS1_avatarbattlemech.txt	
@@ -0,0 +1,50 @@
+art: EnemyRaijinPrefab
+artScale: '0.5'
+bankSmoothing: '10000'
+colliderRadius: '1.4'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+elementSusceptibilityIds:
+- poisonWeakness
+- slowResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '40'
+  flashOffset: '0.33'
+  gunTemplateName: battlemechshotGun
+  mountAngle: '0'
+  mountName: shotgun
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '120'
+  flashOffset: '0.33'
+  gunTemplateName: battlemechdualmachineGun
+  mountAngle: '0'
+  mountName: dualforward
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '120'
+  flashOffset: '0.33'
+  gunTemplateName: battlemechdualmachineGun2
+  mountAngle: '0'
+  mountName: dualside
+  slewRate: '0'
+healthRegenRate: '0'
+loot:
+  bossloot:
+    lootTableId: miniboss
+  upgrades:
+    lootTableId: upgrade_ice_bonus_20
+maxEnergyPoints: '1'
+maxHitPoints: '150'
+maxSpeed: '3.5'
+maxTurnRate: '40'
+minSpeed: '1.5'
+shootable: 'true'
+spawnInvulnerabilitySeconds: '2'
+templateName: avatarbattlemech
+tier: '10'
diff --git config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopus.txt config_180604_1906/Units/68D - Eyeball Dungeon/BOS_octopus.txt
index ae5d4f6..893d397 100644
--- config_180529_2118/Units/68D - Eyeball Dungeon/BOS_octopus.txt	
+++ config_180604_1906/Units/68D - Eyeball Dungeon/BOS_octopus.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/69D - Temple Dungeon/BOS1_smokeboss.txt config_180604_1906/Units/69D - Temple Dungeon/BOS1_smokeboss.txt
index 0532433..061d19d 100644
--- config_180529_2118/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
+++ config_180604_1906/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt config_180604_1906/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt
index df259c0..0064883 100644
--- config_180529_2118/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
+++ config_180604_1906/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
@@ -23,15 +23,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: Speech
-      speechOptions:
-      - nonLocalizedText: main
-        weight: '1'
-      value: '1'
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
diff --git config_180529_2118/events.txt config_180604_1906/events.txt
index 4a3879e..b117516 100644
--- config_180529_2118/events.txt
+++ config_180604_1906/events.txt
@@ -1,19 +1,65 @@
+event_daily_friday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '5'
+      hour: '8'
+      minute: '00'
+event_daily_monday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '1'
+      hour: '8'
+      minute: '00'
+event_daily_saturday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '6'
+      hour: '8'
+      minute: '00'
+event_daily_sunday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '0'
+      hour: '8'
+      minute: '00'
+event_daily_thursday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '4'
+      hour: '8'
+      minute: '00'
+event_daily_tuesday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '2'
+      hour: '8'
+      minute: '00'
+event_daily_wednesday:
+  Time:
+    RunsFor: '23:00'
+    StartsAt:
+      dayOfWeek: '3'
+      hour: '8'
+      minute: '00'
 playtest_event:
-  Effects:
-  - allowConnectionFromEveryone: 'true'
   Time:
     RunsFor: '5'
     StartsAt:
-      day: '16'
+      day: '13'
       dayOfWeek: '3'
       hour: '17'
       minute: '0'
-      month: '5'
+      month: '6'
 test_event:
-  Effects:
-  - xpMultiplier: '1'
+  IsVisibleToClient: 'false'
   Time:
     RunsFor: '23:00'
     StartsAt:
       hour: '10'
       minute: '00'
diff --git config_180529_2118/global.txt config_180604_1906/global.txt
index a4a0f14..dc180ef 100644
--- config_180529_2118/global.txt
+++ config_180604_1906/global.txt
@@ -23,10 +23,11 @@ backend: ozy
 backendErrorPercentage: '0'
 backendMonkeyDelayMaxMs: '500'
 backendMonkeyDelayMinMs: '10'
 baseNumHangarSlots: '2'
 bulletMultipleSpacing: '0.5'
+checkLinkTimeout: '5'
 clientFPS: '60'
 clientNetworkHeartbeatIntervalMs: '6'
 clientOutboundCap: '2000'
 countChildrenForSpawning: 'false'
 deathCamGifUploadMaxKBytesPerSec: '128'
@@ -99,10 +100,11 @@ logNetwork: 'true'
 lootbagLifetime: '30'
 maxActiveUnits: '50000'
 maxStandardSpawnsPerFrame: '5000'
 maxUnitSpawnsPerFrame: '10'
 networkCutoff: '19'
+nexusConnectTimeout: '20'
 nexusGroundHeight: '0.25'
 nexusSpawnQuestHelpers: 'true'
 otherPlayerBulletAlpha: '0.4'
 outboundCap: '32000'
 perfNoBackground: 'false'
@@ -322,29 +324,29 @@ pilotXpTargets:
   xp: '494351'
 planeClassesUsedInTutorial:
 - olfaithful
 - walker
 playerTiers:
-- level: '0'
+- level: '1'
   tier: '0'
-- level: '2'
+- level: '3'
   tier: '1'
-- level: '4'
+- level: '5'
   tier: '2'
-- level: '6'
+- level: '7'
   tier: '3'
-- level: '8'
-  tier: '4'
 - level: '10'
+  tier: '4'
+- level: '13'
   tier: '5'
-- level: '12'
+- level: '16'
   tier: '6'
-- level: '14'
+- level: '18'
   tier: '7'
-- level: '16'
+- level: '20'
   tier: '8'
-- level: '18'
+- level: '20'
   tier: '9'
 - level: '20'
   tier: '10'
 questEncounterDistanceFactor: '1.0'
 questEndTimeLow: '300'
@@ -389,10 +391,13 @@ serverFPS: '10'
 serverNetworkHeartbeatIntervalMs: '24'
 showHitboxes: 'false'
 showNotifications: 'true'
 showSpawns: 'false'
 showTerritoryGrid: 'false'
+shutdownCountdown: '10'
+shutdownDelayToCountdown: '10'
+shutdownWithCameraShake: 'true'
 singleFrameSpawning: 'true'
 spawnWallsOnServer: 'true'
 teleportArrivalTime: '1'
 teleportDelay: '3'
 teleportSafety: '5'
diff --git config_180529_2118/index.txt config_180604_1906/index.txt
index 687dfa0..209eff3 100644
--- config_180529_2118/index.txt
+++ config_180604_1906/index.txt
@@ -15,10 +15,11 @@
 - maneuvers
 - named_loot_tables
 - named_spawn_rules
 - namedEffects
 - namedSusceptibilities
+- news
 - nexus
 - pilotScore
 - playerclasses
 - questGivers
 - questRewardVagueCategories
@@ -396,10 +397,11 @@
 - Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufosaucermanager
 - Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufosaucermini
 - Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles
 - Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkleschest
 - Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinklesDEATH
+- Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkleshyperdrive
 - Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt
 - Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingruntleader
 - Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninja
 - Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjagrenade
 - Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjaleader
@@ -557,10 +559,17 @@
 - Units/61D - Ice Dungeon/unit_frostgiant
 - Units/61D - Ice Dungeon/unit_husky
 - Units/61D - Ice Dungeon/unit_huskyfreezing
 - Units/61D - Ice Dungeon/unit_huskyfreezingminion
 - Units/61D - Ice Dungeon/unit_huskyleader
+- Units/61D - Ice Dungeon/unit_icebossnode1
+- Units/61D - Ice Dungeon/unit_icebossnode2
+- Units/61D - Ice Dungeon/unit_icebossnode3
+- Units/61D - Ice Dungeon/unit_icebossnode4
+- Units/61D - Ice Dungeon/unit_icebossnode5
+- Units/61D - Ice Dungeon/unit_icebossnode6
+- Units/61D - Ice Dungeon/unit_icebossnodemaster
 - Units/61D - Ice Dungeon/zzz_icedungeondestroyablewall
 - Units/61D - Ice Dungeon/zzz_icedungeontreasure
 - Units/61D - Pacifist Dungeon/BOS_bigspiraldestroyablewall
 - Units/61D - Pacifist Dungeon/BOS_bigspiralindestructiblewall
 - Units/61D - Pacifist Dungeon/unit_bigspiral
@@ -680,10 +689,11 @@
 - Units/65D - Grindhouse Dungeon/unit_zombiehatcher
 - Units/65D - Grindhouse Dungeon/zzz_grindhousedungeondestroyablewall
 - Units/65D - Grindhouse Dungeon/zzz_grindhousedungeondestroyablewallstrong
 - Units/65D - Grindhouse Dungeon/zzz_grindhousedungeontreasure
 - Units/66D - Space Dungeon/BOS1_avatar
+- Units/66D - Space Dungeon/BOS1_avatarbattlemech
 - Units/66D - Space Dungeon/BOS1_avatarcannon
 - Units/66D - Space Dungeon/BOS1_avatarDEATH
 - Units/66D - Space Dungeon/BOS1_avatarlaunchtower
 - Units/66D - Space Dungeon/BOS1_avatarlaunchtower2
 - Units/66D - Space Dungeon/BOS1_avatarnova2
diff --git config_180604_1906/news.txt config_180604_1906/news.txt
new file mode 100644
index 0000000..4db3b20
--- /dev/null
+++ config_180604_1906/news.txt
@@ -0,0 +1,10 @@
+news_about_news:
+  IsVisibleToClient: 'true'
+  Time: 2018-05-31 10:00
+news_fowl_furculas:
+  IsVisibleToClient: 'true'
+  Time: 2018-05-24 08:00
+  Url: https://community.steambirds.com/blog/321
+test_news:
+  IsVisibleToClient: 'false'
+  Time: 2018-05-31 00:00