80 files changed, 896 insertions(+), 375 deletions(-)

diff --git config_180702_1804/Items/consumable/trail_galaxy.txt config_180702_1804/Items/consumable/trail_galaxy.txt
new file mode 100644
index 0000000..5dd88fe
--- /dev/null
+++ config_180702_1804/Items/consumable/trail_galaxy.txt
@@ -0,0 +1,11 @@
+actions:
+- soulbound:
+    state: 'true'
+- deco:
+    superTrail: SuperSpeedGalaxy
+hexColor: 0000ff
+icon: ItemDye
+id: trail_galaxy
+slot: ConsumableAction
+tier: '0'
+uses: '5'
diff --git config_180702_1804/Items/consumable/trail_lightning.txt config_180702_1804/Items/consumable/trail_lightning.txt
new file mode 100644
index 0000000..7ebb446
--- /dev/null
+++ config_180702_1804/Items/consumable/trail_lightning.txt
@@ -0,0 +1,11 @@
+actions:
+- soulbound:
+    state: 'true'
+- deco:
+    superTrail: SuperSpeedLightning
+hexColor: 0000ff
+icon: ItemDye
+id: trail_lightning
+slot: ConsumableAction
+tier: '0'
+uses: '5'
diff --git config_180702_1804/Items/consumable/trail_plasma.txt config_180702_1804/Items/consumable/trail_plasma.txt
new file mode 100644
index 0000000..6b207a3
--- /dev/null
+++ config_180702_1804/Items/consumable/trail_plasma.txt
@@ -0,0 +1,11 @@
+actions:
+- soulbound:
+    state: 'true'
+- deco:
+    superTrail: SuperSpeedPlasma
+hexColor: 0000ff
+icon: ItemDye
+id: trail_plasma
+slot: ConsumableAction
+tier: '0'
+uses: '5'
diff --git config_180702_1804/Items/variant/unlock_playerclass_hog_epica.txt config_180702_1804/Items/variant/unlock_playerclass_hog_epica.txt
new file mode 100644
index 0000000..f79ea79
--- /dev/null
+++ config_180702_1804/Items/variant/unlock_playerclass_hog_epica.txt
@@ -0,0 +1,8 @@
+actions:
+- unlock:
+    item_id: playerclass_hog_epica
+    text: action_info_unlock_short
+icon: ItemVariant
+id: unlock_playerclass_hog_epica
+slot: ConsumableAction
+uses: '1'
diff --git config_180625_1904/Quests/quests_daily.txt config_180702_1804/Quests/quests_daily.txt
index 68b85c0..ac680dd 100644
--- config_180625_1904/Quests/quests_daily.txt
+++ config_180702_1804/Quests/quests_daily.txt
@@ -1,49 +1,105 @@
-- autoComplete: 'false'
-  completeAtGiver: tavern
+- activateTimeout: '3'
+  autoComplete: 'true'
   goals:
   - fallbackGuidanceTargets:
-    - mazerunner
-    - mazerunnerspawner
-    setpiece: bombmaze
+    - SP_5XHMT_iceentrance_blizzardcore
+    - SP_5XHMT_iceentrance_treasurelocked
     target: '1'
     type: kill
     units:
-    - id: mazerunnertreasure
-  id: bombmaze
-  permanent: 'false'
-  replayConfig: immediate
+    - id: SP_5XHMT_iceentrance_treasure
+  id: SP_5XHMT_iceentrance
+  joinActivateUnits:
+  - SP_5XHMT_iceentrance_treasure
+  - SP_5XHMT_iceentrance_treasurelocked
+  joinIfNoPlayers: 'true'
+  replayConfig: afterTimeout
+  replayConfigTimeout: 00.00:00:00.00
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '15'
     quests:
     - id: tut_complete
-  showInaccessible: 'false'
-  source: giver
+  source: trigger
   tier: '10'
-- autoComplete: 'false'
-  completeAtGiver: tavern
+  timeLimit: 00:30
+- activateTimeout: '3'
+  autoComplete: 'true'
   goals:
   - fallbackGuidanceTargets:
-    - mazerunner2
-    - mazerunnerspawner2
-    setpiece: bombmaze2
+    - SP_5XHMT_fireentrance_flamebatleader
+    - SP_5XHMT_fireentrance_treasurelocked
     target: '1'
     type: kill
     units:
-    - id: mazerunnertreasure
-  id: bombmaze2
-  permanent: 'false'
-  replayConfig: immediate
+    - id: SP_5XHMT_fireentrance_treasure
+  id: SP_5XHMT_fireentrance
+  joinActivateUnits:
+  - SP_5XHMT_fireentrance_treasure
+  - SP_5XHMT_fireentrance_treasurelocked
+  joinIfNoPlayers: 'true'
+  replayConfig: afterTimeout
+  replayConfigTimeout: 00.00:00:00.00
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '15'
     quests:
     - id: tut_complete
-  showInaccessible: 'false'
-  source: giver
+  source: trigger
+  tier: '10'
+  timeLimit: 00:30
+- activateTimeout: '3'
+  autoComplete: 'true'
+  goals:
+  - fallbackGuidanceTargets:
+    - SP_5XHMT_thiefentrance_key
+    - SP_5XHMT_thiefentrance_treasurelocked
+    target: '1'
+    type: kill
+    units:
+    - id: SP_5XHMT_thiefentrance_treasure
+  id: SP_5XHMT_thiefentrance
+  joinActivateUnits:
+  - SP_5XHMT_thiefentrance_treasure
+  - SP_5XHMT_thiefentrance_treasurelocked
+  joinIfNoPlayers: 'true'
+  replayConfig: afterTimeout
+  replayConfigTimeout: 00.00:00:00.00
+  requirements:
+    planeLevelMax: '20'
+    planeLevelMin: '15'
+    quests:
+    - id: tut_complete
+  source: trigger
+  tier: '10'
+  timeLimit: 00:30
+- activateTimeout: '3'
+  autoComplete: 'true'
+  goals:
+  - fallbackGuidanceTargets:
+    - SP_5XHMT_arena2entrance_mazerunner
+    - SP_5XHMT_arena2entrance_treasurelocked
+    target: '1'
+    type: kill
+    units:
+    - id: SP_5XHMT_arena2entrance_treasure
+  id: SP_5XHMT_arena2entrance
+  joinActivateUnits:
+  - SP_5XHMT_arena2entrance_treasure
+  - SP_5XHMT_arena2entrance_treasurelocked
+  joinIfNoPlayers: 'true'
+  replayConfig: afterTimeout
+  replayConfigTimeout: 00.00:00:00.00
+  requirements:
+    planeLevelMax: '20'
+    planeLevelMin: '15'
+    quests:
+    - id: tut_complete
+  source: trigger
   tier: '10'
+  timeLimit: 00:30
 - autoComplete: 'false'
   completeAtGiver: tavern
   goals:
   - setpiece: DQ_SP_2XMID_gasstation
     target: '1'
@@ -116,48 +172,10 @@
     quests:
     - id: tut_complete
   showInaccessible: 'false'
   source: giver
   tier: '8'
-- autoComplete: 'false'
-  completeAtGiver: tavern
-  goals:
-  - setpiece: DQ_SP_5XHMT_ice
-    target: '1'
-    type: kill
-    units:
-    - id: DQ_SP_5XHMT_ice_treasure
-  id: DQ_SP_5XHMT_ice
-  permanent: 'false'
-  replayConfig: immediate
-  requirements:
-    planeLevelMax: '20'
-    planeLevelMin: '15'
-    quests:
-    - id: tut_complete
-  showInaccessible: 'false'
-  source: giver
-  tier: '10'
-- autoComplete: 'false'
-  completeAtGiver: tavern
-  goals:
-  - setpiece: DQ_SP_5XHMT_fire
-    target: '1'
-    type: kill
-    units:
-    - id: DQ_SP_5XHMT_fire_treasure
-  id: DQ_SP_5XHMT_fire
-  permanent: 'false'
-  replayConfig: immediate
-  requirements:
-    planeLevelMax: '20'
-    planeLevelMin: '15'
-    quests:
-    - id: tut_complete
-  showInaccessible: 'false'
-  source: giver
-  tier: '10'
 - autoComplete: 'true'
   goals: []
   id: dailyreward_Monday
   listSortPriority: '-1000000'
   replayConfig: afterTimeout
diff --git config_180625_1904/Texts/en-US/events.txt config_180702_1804/Texts/en-US/events.txt
index 46e5da1..1290ec2 100644
--- config_180625_1904/Texts/en-US/events.txt
+++ config_180702_1804/Texts/en-US/events.txt
@@ -67,10 +67,16 @@ news_reliable_remiges:
   description: 'Updates on changes over the past 2 weeks, new B-roll and a magnificent new logo!
 
     '
   header_image: example_header_image
   title: 'News: Rapid Reliable Remiges & Rectrices'
+news_sterling_shrikes:
+  description: 'Announcing the upcoming private beta, some beautiful new key art, emotes and a nest of polish and bugfix tasks.
+
+    '
+  header_image: example_header_image
+  title: 'News: Superbly Sterling Shrikes'
 playtest_event:
   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!
diff --git config_180625_1904/Texts/en-US/planeclasses.txt config_180702_1804/Texts/en-US/planeclasses.txt
index 0faba4f..0f13072 100644
--- config_180625_1904/Texts/en-US/planeclasses.txt
+++ config_180702_1804/Texts/en-US/planeclasses.txt
@@ -164,10 +164,13 @@ support:
       flavor: The Bright Lady of the Sky. All rally to the charging Shieldmaiden as she boosts the armor of those who follow her into the fray.
       name: Shieldmaiden
 tank:
   name: Hog
   variants:
+    EpicA:
+      flavor: The Order of St. Avem trained their nuns in the forbidden arts of politics, seduction and assassination. After the purge, only their Ghosts remained.
+      name: Ghost Hog
     default:
       flavor: An immense hulk composed mostly of armor and field generators. The Hog shrugs off bullets as it barrels straight into the crossfire.
       name: Hog
 walker:
   name: Quad
diff --git config_180625_1904/Texts/en-US/quests.txt config_180702_1804/Texts/en-US/quests.txt
index a3bfddf..dcb7910 100644
--- config_180625_1904/Texts/en-US/quests.txt
+++ config_180702_1804/Texts/en-US/quests.txt
@@ -391,33 +391,51 @@ DQ_SP_2XMID_gasstation:
   dialogueOnStart:
   - sergeant: The Empire never mastered fusion hotboxes. Imbeciles.
   - sergeant: So they've been combusting fossilized hydrocarbons to fly their rigs.
   - sergeant: They call it 'Oil'. Burns black.
   title: Fuel Depot
-DQ_SP_5XHMT_fire:
-  description: Informants tell of secret passages leading to the reeducation facilities.
-  dialogueOnStart:
-  - sergeant: Many dog soldiers have a fetish. For degenerate massages.
-  - sergeant: Quite amazing what they reveal when getting their bellies rubbed.
-  title: Lava Tubes
 DQ_SP_5XHMT_heist:
   description: The oligarchs of the Empire tried hiding their ill-gotten coins in a secured facility.
   dialogueOnStart:
   - sergeant: To hack doors, just stay within the marked location till the timer hits zero.
   title: Coin Heist
-DQ_SP_5XHMT_ice:
+DQ_SP_5XHMT_mine:
+  description: A heavily defended surface mine. Raiding time.
+  dialogueOnStart:
+  - sergeant: Strange. They must have located something rather valuable for them to risk such a high visibility operation.
+  title: Strip Mine
+SP_5XHMT_arena2entrance:
+  description: There's a fancy fair being held up in the noble estates. Looks quite festive, with balloon, military parades and whatnot.
+  dialogueOnStart:
+  - sergeant: Why do dictators love parades?
+  - sergeant: The behavior of pathetic little children, if you ask me.
+  - sergeant: Well...pick me up some fried dough if you swing by.
+  goal_0: Defeat the parading <color=#FBB040>Maze Parade</color> and unlock the <color=#FBB040>treasure</color>.
+  title: The Grand Parade
+SP_5XHMT_fireentrance:
+  description: Informants tell of secret passages leading to the reeducation facilities.
+  dialogueOnStart:
+  - sergeant: Many dog soldiers have a fetish. For degenerate massages.
+  - sergeant: Quite amazing what they reveal when getting their bellies rubbed.
+  goal_0: Defeat the 3 <color=#FBB040>Converted Prisoners</color> and unlock the <color=#FBB040>treasure</color>.
+  title: Lava Tubes
+SP_5XHMT_iceentrance:
   description: A recent earthquake revealed an entrance to an unexplored owl monastery.
   dialogueOnStart:
   - sergeant: My great uncle claimed he was a lapsed owl monk.
   - sergeant: Used to drop ice cubes down my Dad's trousers.
   - sergeant: And then laugh like, 'Whoo, whoo, whoo, whoo!
+  goal_0: Destroy the 4 <color=#FBB040>Blizzard Generators</color> and unlock the <color=#FBB040>treasure</color>.
   title: Monastery Entrance
-DQ_SP_5XHMT_mine:
-  description: A heavily defended surface mine. Raiding time.
-  dialogueOnStart:
-  - sergeant: Strange. They must have located something rather valuable for them to risk such a high visibility operation.
-  title: Strip Mine
+SP_5XHMT_thiefentrance:
+  description: We've spotted a center for processing valuables stripped from political prisoners. Might lead to the Vaults.
+  dialogueOnStart:
+  - sergeant: To finance the empire, local officials imprison their wealthy minorities.
+  - sergeant: Then they methodically remove everything of value. Paintings, gold, even wedding rings.
+  - sergeant: It is never too late for restitution.
+  goal_0: Gather the 4 <color=#FBB040>keys</color> and unlock the <color=#FBB040>treasure</color>.
+  title: Vault Deposit
 basic_collect_x_001_beach_T1_fivestarleader:
   description: Go find and collect some fabled Ambergris for a small reward
   title: 'Collect: City Scanner'
 basic_collect_x_002_beach_T1_trainA01:
   description: Go find and collect some fabled Ambergris for a small reward
diff --git config_180625_1904/Texts/en-US/store.txt config_180702_1804/Texts/en-US/store.txt
index aba425e..21f6b5e 100644
--- config_180625_1904/Texts/en-US/store.txt
+++ config_180702_1804/Texts/en-US/store.txt
@@ -27,10 +27,12 @@ product_desc_dye_blue_body: Turns your plane blue
 product_desc_dye_red_body: Turns your plane red
 product_desc_hangar_slot: More place for even more planes
 product_desc_store_bundle_keys1: A binder of 5 special missions deep in Imperial Territory
 product_desc_store_bundle_starter: Jump start your rebel career with extra storage and an extra hangar space.
 product_desc_store_storage_slot: 6 additional storage spaces to keep items. You don't lose items stashed in storage when you are shot down.
+product_desc_unlock_emote_love_fireworks: Love fireworks
+product_desc_unlock_emote_thumbsup: Thumbs up!
 product_name_dye_black: Can of black
 product_name_dye_blue: Can of blue
 product_name_dye_c1_red: Can of c1_red
 product_name_dye_c2_red: Can of c2_red
 product_name_dye_clean_colors: Can of clean_colors
@@ -56,10 +58,12 @@ product_name_dye_yellow: Can of yellow
 product_name_dye_yelloworange: Can of yelloworange
 product_name_hangar_slot: Hangar Slot
 product_name_store_bundle_keys1: Mission Bundle
 product_name_store_bundle_starter: Beginner Bundle
 product_name_store_storage_slot: Additional Storage
+product_name_unlock_emote_love_fireworks: Love
+product_name_unlock_emote_thumbsup: Thumbs up!
 product_popup_action: <color=#FBB040><action:43></color>   Purchase
 product_popup_already_own: ''
 product_popup_limit_exceeded: 'Unvailable: Maximum quantity already owned.'
 product_popup_max_per_account: 'Maximum quantity per account: {0}'
 product_popup_no_inventory: 'Unvailable: You don''t have enough inventory space.'
diff --git config_180625_1904/Texts/en-US/ui.txt config_180702_1804/Texts/en-US/ui.txt
index 110d0ae..851db57 100644
--- config_180625_1904/Texts/en-US/ui.txt
+++ config_180702_1804/Texts/en-US/ui.txt
@@ -590,10 +590,11 @@ quick_chat_title_A: Help!
 quick_chat_title_B: Greeting!
 quick_chat_title_C: Rally to me!
 quick_chat_title_D: Fireworks
 quick_chat_title_LoveFireworks: Love!
 quick_chat_title_PurpleFireworks: Purple fireworks
+quick_chat_title_ThumbsUp: Thumbs up!
 quick_chat_whee: Whee!
 radar_mission: 'Target
 
   <color=#ffa500ff>{0}</color>'
 radar_teleport: '[{0}] to teleport'
diff --git config_180625_1904/Texts/en-US/units.txt config_180702_1804/Texts/en-US/units.txt
index 3e981eb..44ac8eb 100644
--- config_180625_1904/Texts/en-US/units.txt
+++ config_180702_1804/Texts/en-US/units.txt
@@ -55,36 +55,47 @@ DQ_KS_51HMT_hyperdriveminion: Mystic Mirage
 DQ_SP_2XMID_gasstation_command: Fuel Station Command
 DQ_SP_2XMID_gasstation_commandDEATH: Fuel Station Command
 DQ_SP_2XMID_gasstation_commandturret: Water Cannon
 DQ_SP_2XMID_gasstation_gastank: Fuel Tank
 DQ_SP_2XMID_gasstation_turret: Water Cannon
-DQ_SP_5XHMT_fire_flamebatleader: Converted Prisoner
-DQ_SP_5XHMT_fire_treasure: Treasure
 DQ_SP_5XHMT_heist_barracks: Bank Barracks
 DQ_SP_5XHMT_heist_barracksguard: Bank Watch
 DQ_SP_5XHMT_heist_hackconsole: Lock Console
 DQ_SP_5XHMT_heist_hackdoorchain: Locked Door
 DQ_SP_5XHMT_heist_hackdoorchainsignal: Locked Door
 DQ_SP_5XHMT_heist_riotguard: Bank Guard
 DQ_SP_5XHMT_heist_riotguardshield: Bank Guard Shield
 DQ_SP_5XHMT_heist_treasure: Coin Cache
 DQ_SP_5XHMT_heist_turret: Bank Turret
-DQ_SP_5XHMT_ice_blizzardcore: Mega Blizzard Generator
-DQ_SP_5XHMT_ice_treasure: Treasure
 DQ_SP_5XHMT_mine_avalancheparent: Avalanche Worm
 DQ_SP_5XHMT_mine_avalanchesignal: Avalanche Worm
 DQ_SP_5XHMT_mine_avalancheworm: Avalanche Worm
 DQ_SP_5XHMT_mine_keystone: Keystone
 DQ_SP_5XHMT_mine_rock: Rock
 DQ_SP_5XHMT_mine_snakemancer: Snakemancer
 DQ_SP_5XHMT_mine_snakemancersnake01: Spark Snake
 DQ_SP_5XHMT_mine_snakemancersnake01neck: Spark Snake
 DQ_SP_5XHMT_mine_snakemancersnake02: Spark Snake
 DQ_SP_5XHMT_mine_snakemancersnake03: Spark Snake
 DQ_SP_5XHMT_mine_thumper: Thumper
 DQ_SP_5XHMT_mine_thumpernavi: Thumperling
 DQ_SP_5XHMT_mine_treasure: Buried Treasure
+SP_5XHMT_arena2entrance_mazerunner: Maze Parade
+SP_5XHMT_arena2entrance_mazerunnerbomb: Mazer Beam
+SP_5XHMT_arena2entrance_mazerunnersnake: Mazer Snake
+SP_5XHMT_arena2entrance_treasure: Treasure
+SP_5XHMT_arena2entrance_treasurelocked: Treasure
+SP_5XHMT_fireentrance_flamebatleader: Converted Prisoner
+SP_5XHMT_fireentrance_treasure: Treasure
+SP_5XHMT_fireentrance_treasurelocked: Treasure
+SP_5XHMT_iceentrance_blizzardcore: Blizzard Generator
+SP_5XHMT_iceentrance_treasure: Treasure
+SP_5XHMT_iceentrance_treasurelocked: Treasure
+SP_5XHMT_thiefentrance_key: Vault Key
+SP_5XHMT_thiefentrance_lock: Vault Lock
+SP_5XHMT_thiefentrance_treasure: Treasure
+SP_5XHMT_thiefentrance_treasurelocked: Treasure
 advancer: Terrier Carrier
 allymine: Aerial Mine
 allymine1: Aerial Mine
 allymine10: Aerial Mine
 allymine2: Aerial Mine
@@ -564,17 +575,10 @@ locomotionleader: Locomotion
 locomotionwagon: Locomotion Wagon
 mage: Defender Cannon
 mage2: Defender Cannon
 mantaray: Manta Ray
 mazedrawer: Slicer
-mazerunner: Mazer
-mazerunner2: Mazer
-mazerunnerbomb: Mazer Beam
-mazerunnersnake: Mazer Snake
-mazerunnerspawner: Mysterious Maze
-mazerunnerspawner2: Mysterious Maze
-mazerunnertreasure: Treasure
 meatshield: Meatshield
 meatshieldbig: Big Meatshield
 medicClassPlane: Medic
 meowza: Throne of Meowza
 meowzaB1: Godleader Meowza
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt config_180702_1804/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt
index db1fc63..2ae5809 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt	
@@ -1,7 +1,7 @@
-art: EnemyTutFatBlimp
-artScale: '1.5'
+art: EnemyGasstationCommand
+artScale: '1'
 colliderHeight: '1.9'
 colliderWidth: '1.2'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_gastank.txt config_180702_1804/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_gastank.txt
index 6510476..c4d3a3f 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_gastank.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_gastank.txt	
@@ -1,7 +1,7 @@
-art: EnemyHomingBomb_Prefab
-artScale: '4'
+art: EnemyGasstationGastank
+artScale: '1'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig_NoDebris
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_turret.txt config_180702_1804/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_turret.txt
index 7a16adf..e1a1364 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_turret.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_turret.txt	
@@ -1,7 +1,7 @@
-art: EnemyGuardTurret
-artScale: '0.6'
+art: EnemyGasstationTurret
+artScale: '1'
 bankSmoothing: '10000'
 colliderRadius: '.8'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunner.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunner.txt
similarity index 62%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunner.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunner.txt
index e8cfde1..81e60e9 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunner.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunner.txt	
@@ -3,18 +3,19 @@ artScale: '0.5'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '90'
 colliderRadius: '2.5'
 colliderX: '0'
 colliderY: '0'
+effectImmunities:
+- Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig2
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTypeConfig:
-    bulletPrefab: shurikenBullet
     bulletSize: '3'
     burst: '16'
     cooldown: '2'
     damage: '0.5'
     lifetime: '1'
@@ -25,34 +26,15 @@ gunMounts:
     speed: '15'
     spread: '0'
   mountAngle: '45'
   mountName: main
   slewRate: '0'
-- fireMode: JustShootDammit
-  firingArc: '0'
-  flashOffset: '0'
-  gunTypeConfig:
-    bulletPrefab: shurikenBullet
-    bulletSize: '2'
-    burst: '16'
-    cooldown: '6'
-    damage: '0.25'
-    lifetime: '20'
-    multi: '36'
-    multiSpread: '10'
-    name: hammer
-    rof: '4'
-    speed: '2'
-    spread: '0'
-  mountAngle: '45'
-  mountName: main2
-  slewRate: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '500'
 maxSpeed: '0'
 maxTurnRate: '120'
 minSpeed: '0'
 recoilScale: '0'
 spawnInvulnerabilitySeconds: '2'
-templateName: mazerunner
+templateName: SP_5XHMT_arena2entrance_mazerunner
 tier: '10'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerbomb.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt
similarity index 91%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerbomb.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt
index 6002e6b..9dfb771 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerbomb.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt	
@@ -8,11 +8,10 @@ explosionPrefab: Explosion
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0.25'
   gunTypeConfig:
-    bulletPrefab: shurikenBullet
     bulletSize: '3'
     burst: '1'
     cooldown: '3'
     damage: '1'
     lifetime: '6'
@@ -31,7 +30,7 @@ maxHitPoints: '3'
 maxSpeed: '0'
 maxTurnRate: '100'
 minSpeed: '0'
 recoilScale: '0'
 spawnInvulnerabilitySeconds: '3'
-templateName: mazerunnerbomb
+templateName: SP_5XHMT_arena2entrance_mazerunnerbomb
 tier: '10'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergoeast.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergoeast.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast.txt
index 683242b..277c17a 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergoeast.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '0'
 maxTurnRate: '90'
 minSpeed: '0'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: mazerunnergoeast
+templateName: SP_5XHMT_arena2entrance_mazerunnergoeast
 tier: '8'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast_switcher.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast_switcher.txt
new file mode 100644
index 0000000..6d14f7d
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast_switcher.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '90'
+minSpeed: '0'
+showStats: never
+spawnInvulnerabilitySeconds: '100000'
+templateName: SP_5XHMT_arena2entrance_mazerunnergoeast_switcher
+tier: '8'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergonorth.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergonorth.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth.txt
index ab60d7f..6fa3e2d 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergonorth.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '0'
 maxTurnRate: '90'
 minSpeed: '0'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: mazerunnergonorth
+templateName: SP_5XHMT_arena2entrance_mazerunnergonorth
 tier: '8'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth_switcher.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth_switcher.txt
new file mode 100644
index 0000000..0b83d08
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth_switcher.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '90'
+minSpeed: '0'
+showStats: never
+spawnInvulnerabilitySeconds: '100000'
+templateName: SP_5XHMT_arena2entrance_mazerunnergonorth_switcher
+tier: '8'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergonorth2.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergonorth2.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth.txt
index 74ee873..2a25d6d 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergonorth2.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '0'
 maxTurnRate: '90'
 minSpeed: '0'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: mazerunnergonorth2
+templateName: SP_5XHMT_arena2entrance_mazerunnergosouth
 tier: '8'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth_switcher.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth_switcher.txt
new file mode 100644
index 0000000..6b488ab
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth_switcher.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '90'
+minSpeed: '0'
+showStats: never
+spawnInvulnerabilitySeconds: '100000'
+templateName: SP_5XHMT_arena2entrance_mazerunnergosouth_switcher
+tier: '8'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergoeast2.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergoeast2.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest.txt
index a35301d..04e7387 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergoeast2.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '0'
 maxTurnRate: '90'
 minSpeed: '0'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: mazerunnergoeast2
+templateName: SP_5XHMT_arena2entrance_mazerunnergowest
 tier: '8'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest_switcher.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest_switcher.txt
new file mode 100644
index 0000000..4f705ee
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest_switcher.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '90'
+minSpeed: '0'
+showStats: never
+spawnInvulnerabilitySeconds: '100000'
+templateName: SP_5XHMT_arena2entrance_mazerunnergowest_switcher
+tier: '8'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnersnake.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnersnake.txt
similarity index 80%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnersnake.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnersnake.txt
index 07a4c66..8b1ad15 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnersnake.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnersnake.txt	
@@ -13,28 +13,28 @@ gunMounts:
   firingArc: '0'
   flashOffset: '0'
   gunTypeConfig:
     bulletPrefab: shurikenBullet
     bulletSize: '3'
-    burst: '2'
-    cooldown: '5'
+    burst: '1'
+    cooldown: '1'
     damage: '0.5'
-    lifetime: '5'
-    multi: '2'
-    multiSpread: '180'
+    lifetime: '0.25'
+    multi: '1'
+    multiSpread: '0'
     name: hammer
     rof: '4'
-    speed: '5'
+    speed: '0'
     spread: '0'
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '12.5'
 maxSpeed: '4'
 maxTurnRate: '90'
 minSpeed: '4'
 spawnInvulnerabilitySeconds: '10000000'
-templateName: mazerunnersnake
+templateName: SP_5XHMT_arena2entrance_mazerunnersnake
 tier: '2'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnertreasure.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasure.txt
similarity index 91%
rename from config_180625_1904/Units/00 - Quest Enemies/test/mazerunnertreasure.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasure.txt
index 213f867..5e31159 100644
--- config_180625_1904/Units/00 - Quest Enemies/test/mazerunnertreasure.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasure.txt	
@@ -19,8 +19,8 @@ maxHitPoints: '500'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 showStats: always
 spawnInvulnerabilitySeconds: '0'
-templateName: mazerunnertreasure
+templateName: SP_5XHMT_arena2entrance_treasure
 tier: '10'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasurelocked.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasurelocked.txt
new file mode 100644
index 0000000..9bb1c6e
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasurelocked.txt	
@@ -0,0 +1,18 @@
+art: TutorialTreasurePrefab
+artScale: '1'
+colliderRadius: '1.2'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '500'
+maxSpeed: '0.0'
+maxTurnRate: '90'
+minSpeed: '0.0'
+showStats: always
+spawnInvulnerabilitySeconds: '0'
+templateName: SP_5XHMT_arena2entrance_treasurelocked
+tier: '10'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_flamebatleader.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_flamebatleader.txt
similarity index 96%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_flamebatleader.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_flamebatleader.txt
index b8b8b63..3c8c881 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_flamebatleader.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_flamebatleader.txt	
@@ -74,8 +74,8 @@ particlePositions:
   rot:
   - '0'
   - '0'
   - '0'
 spawnInvulnerabilitySeconds: '2'
-templateName: DQ_SP_5XHMT_fire_flamebatleader
+templateName: SP_5XHMT_fireentrance_flamebatleader
 tier: '10'
 xpMultiplier: '1.25'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_treasure.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasure.txt
similarity index 91%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_treasure.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasure.txt
index 0f9b8c0..288e76f 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_treasure.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasure.txt	
@@ -19,8 +19,8 @@ maxHitPoints: '500'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 showStats: always
 spawnInvulnerabilitySeconds: '0'
-templateName: DQ_SP_5XHMT_fire_treasure
+templateName: SP_5XHMT_fireentrance_treasure
 tier: '10'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasurelocked.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasurelocked.txt
new file mode 100644
index 0000000..5689e88
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasurelocked.txt	
@@ -0,0 +1,18 @@
+art: TutorialTreasurePrefab
+artScale: '1'
+colliderRadius: '1.2'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '500'
+maxSpeed: '0.0'
+maxTurnRate: '90'
+minSpeed: '0.0'
+showStats: always
+spawnInvulnerabilitySeconds: '0'
+templateName: SP_5XHMT_fireentrance_treasurelocked
+tier: '10'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_blizzardcore.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt
similarity index 92%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_blizzardcore.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt
index 4bcd5c4..7c07ab8 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_blizzardcore.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt	
@@ -20,8 +20,8 @@ maxEnergyPoints: '1'
 maxHitPoints: '100'
 maxSpeed: '0'
 maxTurnRate: '90'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
-templateName: DQ_SP_5XHMT_ice_blizzardcore
+templateName: SP_5XHMT_iceentrance_blizzardcore
 tier: '10'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain2.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain1.txt
similarity index 87%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain2.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain1.txt
index 5426b42..509cb09 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain2.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain1.txt	
@@ -12,8 +12,8 @@ maxEnergyPoints: '1'
 maxHitPoints: '10000000'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_ice_hackdoorchain2
+templateName: SP_5XHMT_iceentrance_hackdoorchain1
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain4.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain2.txt
similarity index 87%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain4.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain2.txt
index 2ca80e8..0a971ac 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain4.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain2.txt	
@@ -12,8 +12,8 @@ maxEnergyPoints: '1'
 maxHitPoints: '10000000'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_ice_hackdoorchain4
+templateName: SP_5XHMT_iceentrance_hackdoorchain2
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain3.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain3.txt
similarity index 87%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain3.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain3.txt
index 342a815..11f96f5 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain3.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain3.txt	
@@ -12,8 +12,8 @@ maxEnergyPoints: '1'
 maxHitPoints: '10000000'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_ice_hackdoorchain3
+templateName: SP_5XHMT_iceentrance_hackdoorchain3
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain1.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain4.txt
similarity index 87%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain1.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain4.txt
index 61c03c8..ac6b897 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain1.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain4.txt	
@@ -12,8 +12,8 @@ maxEnergyPoints: '1'
 maxHitPoints: '10000000'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_ice_hackdoorchain1
+templateName: SP_5XHMT_iceentrance_hackdoorchain4
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal1.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal1.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal1.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal1.txt
index 8c5b314..e2dfbc6 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal1.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal1.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '3'
 maxTurnRate: '180'
 minSpeed: '3'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_heist_hackdoorchainsignal1
+templateName: SP_5XHMT_iceentrance_hackdoorchainsignal1
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal2.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal2.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal2.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal2.txt
index bf71129..714ac9a 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal2.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal2.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '3'
 maxTurnRate: '180'
 minSpeed: '3'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_heist_hackdoorchainsignal2
+templateName: SP_5XHMT_iceentrance_hackdoorchainsignal2
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal3.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal3.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal3.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal3.txt
index ab89dad..7ea09e2 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal3.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal3.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '3'
 maxTurnRate: '180'
 minSpeed: '3'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_heist_hackdoorchainsignal3
+templateName: SP_5XHMT_iceentrance_hackdoorchainsignal3
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal4.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal4.txt
similarity index 86%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal4.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal4.txt
index fd44ce5..a81c696 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal4.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal4.txt	
@@ -12,8 +12,8 @@ maxHitPoints: '10000000'
 maxSpeed: '3'
 maxTurnRate: '180'
 minSpeed: '3'
 showStats: never
 spawnInvulnerabilitySeconds: '100000'
-templateName: DQ_SP_5XHMT_heist_hackdoorchainsignal4
+templateName: SP_5XHMT_iceentrance_hackdoorchainsignal4
 tier: '8'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasure.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasure.txt
new file mode 100644
index 0000000..a23b443
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasure.txt	
@@ -0,0 +1,26 @@
+art: TutorialTreasurePrefab
+artScale: '1'
+colliderRadius: '1.2'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0.0001'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+lootGlobal:
+  main:
+    lootTable:
+    - weight: '50'
+    - items:
+      - id: dungeon_ice
+      weight: '50'
+maxEnergyPoints: '1'
+maxHitPoints: '500'
+maxSpeed: '0.0'
+maxTurnRate: '0'
+minSpeed: '0.0'
+showStats: always
+spawnInvulnerabilitySeconds: '0'
+templateName: SP_5XHMT_iceentrance_treasure
+tier: '10'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_treasure.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasurelocked.txt
similarity index 72%
rename from config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_treasure.txt
rename to config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasurelocked.txt
index 43f9770..15c52e1 100644
--- config_180625_1904/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_treasure.txt	
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasurelocked.txt	
@@ -1,75 +1,67 @@
 additionalStates:
   unlock1:
   - name: initial
     transitions:
     - code: NearMarker
-      name: DQ_SP_5XHMT_heist_hackdoorchainsignal1
+      name: SP_5XHMT_iceentrance_hackdoorchainsignal1
       toState: main
       value: '6'
   - events:
     - code: VariableSet
       name: triggershield1
       value: '1'
     name: main
   unlock2:
   - name: initial
     transitions:
     - code: NearMarker
-      name: DQ_SP_5XHMT_heist_hackdoorchainsignal2
+      name: SP_5XHMT_iceentrance_hackdoorchainsignal2
       toState: main
       value: '6'
   - events:
     - code: VariableSet
       name: triggershield2
       value: '1'
     name: main
   unlock3:
   - name: initial
     transitions:
     - code: NearMarker
-      name: DQ_SP_5XHMT_heist_hackdoorchainsignal3
+      name: SP_5XHMT_iceentrance_hackdoorchainsignal3
       toState: main
       value: '6'
   - events:
     - code: VariableSet
       name: triggershield3
       value: '1'
     name: main
   unlock4:
   - name: initial
     transitions:
     - code: NearMarker
-      name: DQ_SP_5XHMT_heist_hackdoorchainsignal4
+      name: SP_5XHMT_iceentrance_hackdoorchainsignal4
       toState: main
       value: '6'
   - events:
     - code: VariableSet
       name: triggershield4
       value: '1'
     name: main
 art: TutorialTreasurePrefab
 artScale: '1'
 colliderRadius: '1.2'
 colliderX: '0'
 colliderY: '0'
-damageThreshold: '0.0001'
 energyRegenRate: '0'
-explosionPrefab: ExplosionBig2
+explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
-lootGlobal:
-  main:
-    lootTable:
-    - weight: '50'
-    - items:
-      - id: dungeon_ice
-      weight: '50'
 maxEnergyPoints: '1'
 maxHitPoints: '500'
 maxSpeed: '0.0'
-maxTurnRate: '0'
+maxTurnRate: '90'
 minSpeed: '0.0'
 showStats: always
 spawnInvulnerabilitySeconds: '0'
-templateName: DQ_SP_5XHMT_ice_treasure
+templateName: SP_5XHMT_iceentrance_treasurelocked
 tier: '10'
 xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_key.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_key.txt
new file mode 100644
index 0000000..84a47f7
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_key.txt	
@@ -0,0 +1,46 @@
+art: EnemyGoldenKey
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+energyRegenRate: '0'
+gunMounts:
+- fireMode: Aimed
+  firingArc: '180'
+  flashOffset: '0'
+  gunTypeConfig:
+    bulletHue: green
+    bulletPalette: all_color
+    bulletPrefab: leisurelyBullet
+    bulletSize: '1.1'
+    burst: '800000'
+    cooldown: '0'
+    damage: '0'
+    guaranteedHitArcA: '-90'
+    guaranteedHitArcB: '90'
+    guaranteedHitMaxRange: '8'
+    guaranteedHitMinRange: '0'
+    guaranteedHitMode: PerShot
+    lifetime: '2'
+    range: '8'
+    rof: '5'
+    speed: '8'
+  mountAngle: '0'
+  mountName: main
+  offset:
+  - '-0.3'
+  - '0'
+  sfx:
+    sound: 'null'
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '3.5'
+maxTurnRate: '40'
+minSpeed: '1.5'
+recoilScale: '0'
+spawnInvulnerabilitySeconds: '1000000'
+templateName: SP_5XHMT_thiefentrance_key
+tier: '10'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner1.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner1.txt
new file mode 100644
index 0000000..4007131
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner1.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+recoilScale: '0'
+spawnInvulnerabilitySeconds: '1000000'
+templateName: SP_5XHMT_thiefentrance_keyspawner1
+tier: '10'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner2.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner2.txt
new file mode 100644
index 0000000..a455966
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner2.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+recoilScale: '0'
+spawnInvulnerabilitySeconds: '1000000'
+templateName: SP_5XHMT_thiefentrance_keyspawner2
+tier: '10'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner3.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner3.txt
new file mode 100644
index 0000000..fd0463a
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner3.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+recoilScale: '0'
+spawnInvulnerabilitySeconds: '1000000'
+templateName: SP_5XHMT_thiefentrance_keyspawner3
+tier: '10'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner4.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner4.txt
new file mode 100644
index 0000000..553e81a
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner4.txt	
@@ -0,0 +1,19 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10000000'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+recoilScale: '0'
+spawnInvulnerabilitySeconds: '1000000'
+templateName: SP_5XHMT_thiefentrance_keyspawner4
+tier: '10'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_lock.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_lock.txt
new file mode 100644
index 0000000..59b5ac1
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_lock.txt	
@@ -0,0 +1,19 @@
+art: EnemyHorusAltarPrefab
+artScale: '0.75'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+effectImmunities:
+- Confuse
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig_NoDebris
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '500'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '2'
+templateName: SP_5XHMT_thiefentrance_lock
+tier: '10'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasure.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasure.txt
new file mode 100644
index 0000000..f895a0c
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasure.txt	
@@ -0,0 +1,26 @@
+art: TutorialTreasurePrefab
+artScale: '1'
+colliderRadius: '1.2'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0.0001'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+lootGlobal:
+  main:
+    lootTable:
+    - weight: '50'
+    - items:
+      - id: dungeon_thief
+      weight: '50'
+maxEnergyPoints: '1'
+maxHitPoints: '500'
+maxSpeed: '0.0'
+maxTurnRate: '0'
+minSpeed: '0.0'
+showStats: always
+spawnInvulnerabilitySeconds: '0'
+templateName: SP_5XHMT_thiefentrance_treasure
+tier: '10'
+xpMultiplier: '0'
diff --git config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasurelocked.txt config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasurelocked.txt
new file mode 100644
index 0000000..3178ba2
--- /dev/null
+++ config_180702_1804/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasurelocked.txt	
@@ -0,0 +1,18 @@
+art: TutorialTreasurePrefab
+artScale: '1'
+colliderRadius: '1.2'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '500'
+maxSpeed: '0.0'
+maxTurnRate: '90'
+minSpeed: '0.0'
+showStats: always
+spawnInvulnerabilitySeconds: '0'
+templateName: SP_5XHMT_thiefentrance_treasurelocked
+tier: '10'
+xpMultiplier: '0'
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunner2.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunner2.txt
deleted file mode 100644
index f0b75cb..0000000
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergosouth.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergosouth.txt
deleted file mode 100644
index bfa2e6c..0000000
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergosouth2.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergosouth2.txt
deleted file mode 100644
index 4aa0381..0000000
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergowest.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergowest.txt
deleted file mode 100644
index 81ed8b1..0000000
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergowest2.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunnergowest2.txt
deleted file mode 100644
index bb2ca1f..0000000
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerspawner.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerspawner.txt
deleted file mode 100644
index 804f4ea..0000000
diff --git config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerspawner2.txt config_180625_1904/Units/00 - Quest Enemies/test/mazerunnerspawner2.txt
deleted file mode 100644
index b1d5cd1..0000000
diff --git config_180625_1904/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt config_180702_1804/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt
index 526a374..bf2e65e 100644
--- config_180625_1904/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt	
+++ config_180702_1804/Units/41 - Mountains (City) - SpaceTravel/BOS_hypnotistminion.txt	
@@ -172,9 +172,9 @@ healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '100000000'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
-spawnInvulnerabilitySeconds: '0'
+spawnInvulnerabilitySeconds: '10000000'
 templateName: hypnotistMinion
 tier: '8'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/54 - Kaiju Event/BOS1_kaijubigbubblebomb.txt config_180702_1804/Units/54 - Kaiju Event/BOS1_kaijubigbubblebomb.txt
index 80f1538..ed9e23c 100644
--- config_180625_1904/Units/54 - Kaiju Event/BOS1_kaijubigbubblebomb.txt	
+++ config_180702_1804/Units/54 - Kaiju Event/BOS1_kaijubigbubblebomb.txt	
@@ -25,11 +25,11 @@ gunMounts:
     guaranteedHitMaxRange: '8'
     guaranteedHitMinRange: '0'
     guaranteedHitMode: PerShot
     lifetime: '2'
     range: '8'
-    rof: '20'
+    rof: '5'
     speed: '8'
   mountAngle: '0'
   mountName: main
   offset:
   - '-0.3'
diff --git config_180625_1904/Units/67D - Thief Dungeon/BOS_thiefchest.txt config_180702_1804/Units/67D - Thief Dungeon/BOS_thiefchest.txt
index 4c192c8..5c18eb3 100644
--- config_180625_1904/Units/67D - Thief Dungeon/BOS_thiefchest.txt	
+++ config_180702_1804/Units/67D - Thief Dungeon/BOS_thiefchest.txt	
@@ -23,11 +23,11 @@ gunMounts:
     guaranteedHitMaxRange: '8'
     guaranteedHitMinRange: '0'
     guaranteedHitMode: PerShot
     lifetime: '2'
     range: '8'
-    rof: '20'
+    rof: '5'
     speed: '8'
   mountAngle: '0'
   mountName: main
   offset:
   - '-0.3'
diff --git config_180625_1904/Units/67D - Thief Dungeon/unit_shockeye.txt config_180702_1804/Units/67D - Thief Dungeon/unit_shockeye.txt
index 81cc0fc..7e2c30f 100644
--- config_180625_1904/Units/67D - Thief Dungeon/unit_shockeye.txt	
+++ config_180702_1804/Units/67D - Thief Dungeon/unit_shockeye.txt	
@@ -1,7 +1,7 @@
 art: EnemyThiefShockeye
-artScale: '1'
+artScale: '0.75'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - burnWeakness
diff --git config_180625_1904/Units/71D - Escort Mission Dungeon/unit_escorthealdrone.txt config_180702_1804/Units/71D - Escort Mission Dungeon/unit_escorthealdrone.txt
index 1b4231b..44e4bb1 100644
--- config_180625_1904/Units/71D - Escort Mission Dungeon/unit_escorthealdrone.txt	
+++ config_180702_1804/Units/71D - Escort Mission Dungeon/unit_escorthealdrone.txt	
@@ -21,11 +21,11 @@ gunMounts:
     guaranteedHitMaxRange: '8'
     guaranteedHitMinRange: '0'
     guaranteedHitMode: PerShot
     lifetime: '2'
     range: '8'
-    rof: '20'
+    rof: '5'
     speed: '8'
   mountAngle: '0'
   mountName: main
   offset:
   - '-0.3'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt config_180702_1804/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt
index 22c5ee7..a932c21 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt	
@@ -67,8 +67,27 @@ loot:
 maxEnergyPoints: '1'
 maxHitPoints: '1500'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '-2.6'
+  - '-0.65'
+  - '1'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+- name: darkSmoke
+  pos:
+  - '0'
+  - '-1.16'
+  - '3.7'
+  rot:
+  - '0'
+  - '0'
+  - '90'
 spawnInvulnerabilitySeconds: '3'
 templateName: swarmboss
 tier: '5'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt config_180702_1804/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt
index 8dc7649..dbb6e18 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt	
@@ -1,10 +1,10 @@
-art: EnemyTempEyeB
-artScale: '3'
+art: EnemyArena1Boss
+artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
-colliderRadius: '0.75'
+colliderRadius: '1.25'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig2
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/BOS_swarmbossswarm.txt config_180702_1804/Units/72D - Arena Dungeon 1/BOS_swarmbossswarm.txt
index 0b0cb94..dead2df 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/BOS_swarmbossswarm.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/BOS_swarmbossswarm.txt	
@@ -33,9 +33,28 @@ isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '5'
 maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '0.25'
+  - '-0.23'
+  - '0.4'
+  rot:
+  - '0'
+  - '0'
+  - '90'
+- name: darkSmoke
+  pos:
+  - '-0.25'
+  - '-0.23'
+  - '0.4'
+  rot:
+  - '0'
+  - '0'
+  - '90'
 spawnInvulnerabilitySeconds: '0.5'
 templateName: swarmbossswarm
 tier: '5'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/SLO_arenatetra.txt config_180702_1804/Units/72D - Arena Dungeon 1/SLO_arenatetra.txt
index 8b69fb9..4acded2 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/SLO_arenatetra.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/SLO_arenatetra.txt	
@@ -138,8 +138,18 @@ healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '80'
 maxSpeed: '0'
 maxTurnRate: '120'
 minSpeed: '0'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - -.23
+  - '-0.5'
+  - '-1.6'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
 spawnInvulnerabilitySeconds: '2'
 templateName: arenatetra
 tier: '5'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenaangel.txt config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenaangel.txt
index 3e790ce..b6a55f1 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenaangel.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenaangel.txt	
@@ -48,8 +48,27 @@ healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '35'
 maxSpeed: '1'
 maxTurnRate: '120'
 minSpeed: '0'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '-0.2'
+  - '-0.1'
+  - '0.5'
+  rot:
+  - '0'
+  - '0'
+  - '0'
+- name: darkSmoke
+  pos:
+  - '0.16'
+  - '-0.6'
+  - '0.72'
+  rot:
+  - '0'
+  - '0'
+  - '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: arenaangel
 tier: '5'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt
index 2e3b232..6344040 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenalasereye.txt	
@@ -37,8 +37,27 @@ healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '18'
 maxSpeed: '3'
 maxTurnRate: '360'
 minSpeed: '3'
+particlePositions:
+- name: darkSmokeSlow
+  pos:
+  - '-0.3'
+  - '-0.5'
+  - '-1.7'
+  rot:
+  - '-90'
+  - '0'
+  - '0'
+- name: darkSmokeSlow
+  pos:
+  - '0.65'
+  - '-0.38'
+  - '-1.8'
+  rot:
+  - '-90'
+  - '0'
+  - '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: arenalasereye
 tier: '5'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenaswarm.txt config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenaswarm.txt
index 7a29750..4e7b97d 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenaswarm.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenaswarm.txt	
@@ -33,10 +33,20 @@ isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '2'
 maxSpeed: '3'
 maxTurnRate: '360'
 minSpeed: '3'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '0'
+  - '-0.36'
+  - '0.07'
+  rot:
+  - '0'
+  - '0'
+  - '0'
 spawnEffect: SpawnEffect
 spawnInvulnerabilitySeconds: '0.5'
 templateName: arenaswarm
 tier: '5'
 xpMultiplier: '0'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenatackler.txt config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenatackler.txt
index 1a8b879..042348d 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenatackler.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenatackler.txt	
@@ -58,8 +58,27 @@ healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '20'
 maxSpeed: '0'
 maxTurnRate: '120'
 minSpeed: '0'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '-0.19'
+  - '-0.9'
+  - '-0.7'
+  rot:
+  - '0'
+  - '0'
+  - '0'
+- name: darkSmoke
+  pos:
+  - '0.21'
+  - '-0.9'
+  - '-0.7'
+  rot:
+  - '0'
+  - '0'
+  - '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: arenatackler
 tier: '5'
diff --git config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt
index 812810c..e581e95 100644
--- config_180625_1904/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt	
+++ config_180702_1804/Units/72D - Arena Dungeon 1/unit_arenawhaleshark.txt	
@@ -33,13 +33,13 @@ maxSpeed: '2.2'
 maxTurnRate: '60'
 minSpeed: '1.5'
 particlePositions:
 - name: darkSmoke
   pos:
-  - '-0.4'
-  - '-0.03'
-  - '-1.3'
+  - '-0.35'
+  - '1.12'
+  - '-1.2'
   rot:
   - '0'
   - '0'
   - '-90'
 spawnInvulnerabilitySeconds: '2'
diff --git config_180702_1804/Units/Player/unit_tank.txt config_180702_1804/Units/Player/unit_tank.txt
new file mode 100644
index 0000000..008532f
--- /dev/null
+++ config_180702_1804/Units/Player/unit_tank.txt
@@ -0,0 +1,108 @@
+bankAmount: '60'
+bankSmoothing: '0.15'
+cloudOffset: '0.2'
+colliderRadius: '0.3'
+colliderX: '0'
+colliderY: '0'
+deathGuns:
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: teal
+    bulletPalette: glow
+    bulletPrefab: arrowBullet
+    bulletSize: '4.0'
+    burst: '36'
+    cooldown: '0'
+    damage: '24'
+    isPiercing: 'true'
+    lifetime: '1'
+    multi: '12'
+    multiSpread: '10'
+    name: death1gun
+    rof: '1'
+    speed: '10'
+    spread: '0'
+  mountAngle: '0'
+  mountName: death1
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '0.4'
+  gunTypeConfig:
+    bulletHue: teal
+    bulletPalette: glow
+    bulletPrefab: arrowBullet
+    bulletSize: '4.0'
+    burst: '36'
+    cooldown: '0'
+    damage: '24'
+    isPiercing: 'true'
+    lifetime: '1'
+    multi: '12'
+    multiSpread: '10'
+    name: death1gun
+    rof: '1'
+    speed: '10'
+    spread: '0'
+  mountAngle: '180'
+  mountName: death2
+  slewRate: '0'
+energyRegenRate: '0.4'
+engineSound: sfx_player_motorloop_hog
+gunMounts:
+- fireMode: Aimed
+  firingArc: '0'
+  flashOffset: '0.6'
+  gunTemplateName: playerBlaster0
+  mountAngle: '0'
+  mountName: main
+  slewRate: '0'
+healthRegenRate: '0.6'
+maxEnergyPoints: '100'
+maxGunRotationAngleOffset: '0'
+maxHitPoints: '15'
+maxSpeed: '2.5'
+maxTurnRate: '220'
+minSpeed: '2.5'
+movementTuningRelative:
+  gunRotationConfig:
+    Circular: 'true'
+    Mode: SmoothDamp
+    Slew0: '0.1'
+    Slew1: '1440'
+  leanResponseCurve:
+    keyframes:
+    - time: '0'
+      value: '0'
+    - time: '30'
+      value: '0.2'
+    - time: '45'
+      value: '0.3'
+    - time: '55'
+      value: '0.5'
+    - time: '90'
+      value: '0.6'
+    - time: '100'
+      value: '1'
+    - time: '180'
+      value: '1'
+  rudderConfig:
+    Mode: Instant
+  throttleConfig:
+    Circular: 'false'
+    Mode: ConstantSpeed
+    Slew0: '10'
+    Slew1: '1'
+showAimHelperGun: 'false'
+showAimHelperMove: 'false'
+spawnInvulnerabilitySeconds: '5'
+steeringType: Relative
+superspeedFactor: '2.0'
+superspeedMinEnergy: '0'
+superspeedSustainEnergy: '0'
+superspeedTurnRateMultiplier: '1.333'
+templateName: tankClassPlane
+tuneUnitController: 'true'
+xpMultiplier: '0'
diff --git config_180625_1904/global.txt config_180702_1804/global.txt
index 3c55ff4..37ae413 100644
--- config_180625_1904/global.txt
+++ config_180702_1804/global.txt
@@ -3,10 +3,11 @@ areAllAISpawnsImmediate: 'false'
 artificialInputLag: '0'
 audit:
   bulletCountUntilActive: '25'
   bulletTrackTimeout: '3'
   checkErrorRateTimeout: '5'
+  dockingDistanceThreshold: '5'
   isAuditScreenshotsActiveGIF: 'true'
   isAuditScreenshotsActivePNG: 'false'
   isFeedingBulletSpawnsIntoAudit: 'true'
   isUsingMirrorForBulletCollision: 'true'
   isUsingUntrustedForBulletCollision: 'true'
diff --git config_180625_1904/index.txt config_180702_1804/index.txt
index df28878..16f701f 100644
--- config_180625_1904/index.txt
+++ config_180702_1804/index.txt
@@ -997,10 +997,11 @@
 - Units/Items/unit_anchorminion
 - Units/Player/unit_assault
 - Units/Player/unit_medic
 - Units/Player/unit_playerPlane
 - Units/Player/unit_rapier
+- Units/Player/unit_tank
 - Units/Player/unit_walker
 - Units/Test/BOS1_fivestarleadertest
 - Units/Test/BOS1_fivestartest
 - Units/Test/BOS1_fivestartestrotate
 - Units/Test/BOS2_killfamtestchild
@@ -1024,25 +1025,10 @@
 - Units/00 - Quest Enemies/escort_01/escort_01_master
 - Units/00 - Quest Enemies/escort_01/escort_01_missile
 - Units/00 - Quest Enemies/escort_01/escort_01_missilespawner
 - Units/00 - Quest Enemies/escort_01/escort_01_reward
 - Units/00 - Quest Enemies/escort_01/escort_01_startbutton
-- Units/00 - Quest Enemies/test/mazerunner
-- Units/00 - Quest Enemies/test/mazerunner2
-- Units/00 - Quest Enemies/test/mazerunnerbomb
-- Units/00 - Quest Enemies/test/mazerunnergoeast
-- Units/00 - Quest Enemies/test/mazerunnergoeast2
-- Units/00 - Quest Enemies/test/mazerunnergonorth
-- Units/00 - Quest Enemies/test/mazerunnergonorth2
-- Units/00 - Quest Enemies/test/mazerunnergosouth
-- Units/00 - Quest Enemies/test/mazerunnergosouth2
-- Units/00 - Quest Enemies/test/mazerunnergowest
-- Units/00 - Quest Enemies/test/mazerunnergowest2
-- Units/00 - Quest Enemies/test/mazerunnersnake
-- Units/00 - Quest Enemies/test/mazerunnerspawner
-- Units/00 - Quest Enemies/test/mazerunnerspawner2
-- Units/00 - Quest Enemies/test/mazerunnertreasure
 - Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimp
 - Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimpDEATH
 - Units/00 - Quest Enemies/tut_02/BOS_tut_02_flakblimp
 - Units/00 - Quest Enemies/tut_02/BOS_tut_02_flakblimpexploderstrong
 - Units/00 - Quest Enemies/tut_02/unit_tut_02_supplies
@@ -1139,39 +1125,62 @@
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_commandturret
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_destroyablewall
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_gastank
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_gastankboom
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_turret
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_flamebatleader
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_fire/DQ_SP_5XHMT_fire_treasure
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_barracks
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_barracksguard
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_hackconsole
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_hackdoorchain
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_hackdoorchainsignal
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_riotguard
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_riotguardshield
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_treasure
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_heist/DQ_SP_5XHMT_heist_turret
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_blizzardcore
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain1
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain2
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain3
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchain4
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal1
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal2
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal3
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_hackdoorchainsignal4
-- Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_ice/DQ_SP_5XHMT_ice_treasure
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_avalancheparent
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_avalanchesignal
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_avalancheworm
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_keystone
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_rock
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_snakemancer
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_snakemancersnake01
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_snakemancersnake01neck
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_snakemancersnake02
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_snakemancersnake03
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_thumper
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_thumpernavi
 - Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_5XHMT_mine/DQ_SP_5XHMT_mine_treasure
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunner
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergoeast_switcher
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergonorth_switcher
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergosouth_switcher
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnergowest_switcher
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnersnake
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasure
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_treasurelocked
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_flamebatleader
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasure
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_fireentrance/SP_5XHMT_fireentrance_treasurelocked
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain1
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain2
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain3
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchain4
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal1
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal2
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal3
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_hackdoorchainsignal4
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasure
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_treasurelocked
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_key
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner1
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner2
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner3
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_keyspawner4
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_lock
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasure
+- Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_thiefentrance/SP_5XHMT_thiefentrance_treasurelocked
diff --git config_180625_1904/instantEffects.txt config_180702_1804/instantEffects.txt
index 3b54969..5c96112 100644
--- config_180625_1904/instantEffects.txt
+++ config_180702_1804/instantEffects.txt
@@ -480,22 +480,10 @@ maneuverBash:
       sound: Bash Start
 maneuverDash:
   steps:
   - sfx:
       sound: Barrel roll maneuver
-maneuverDocking:
-  steps:
-  - sfx:
-      sound: Docking
-maneuverDockingInitiate:
-  steps:
-  - sfx:
-      sound: Docking Initiate
-maneuverDockingUndock:
-  steps:
-  - sfx:
-      sound: Docking Undock
 maneuverShortShield:
   steps:
   - doesFollowUnit: 'true'
     prefab: PlaneShieldShort
 maneuverTankActivate:
diff --git config_180625_1904/news.txt config_180702_1804/news.txt
index 8006c5e..5100f6c 100644
--- config_180625_1904/news.txt
+++ config_180702_1804/news.txt
@@ -11,8 +11,12 @@ news_quizzical_quails:
   Url: https://community.steambirds.com/blog/323
 news_reliable_remiges:
   IsVisibleToClient: 'true'
   Time: 2018-06-19 15:00
   Url: https://community.steambirds.com/blog/324
+news_sterling_shrikes:
+  IsVisibleToClient: 'true'
+  Time: 2018-06-26 00:00
+  Url: https://community.steambirds.com/blog/325
 test_news:
   IsVisibleToClient: 'false'
   Time: 2018-05-31 00:00
diff --git config_180625_1904/playerclasses.txt config_180702_1804/playerclasses.txt
index 6254d9c..1bf3c3c 100644
--- config_180625_1904/playerclasses.txt
+++ config_180702_1804/playerclasses.txt
@@ -408,11 +408,11 @@ medic:
     hideIfLocked: 'true'
     id: VariantB
     prefab: PlayerMedicVariantB
     unlockItemId: playerclass_medic_variantb
   - cloudOverride: healCloudFXPremium
-    extraColor1: ecd19e
+    extraColor1: ebddc3
     extraColor2: 1c1a26
     extraColor3: 1c1a26
     hideIfLocked: 'true'
     id: EpicA
     livery: ghost.medic
@@ -839,11 +839,11 @@ tank:
   - poison_blast
   basicTutorial: DungeonTutorial
   defaultUpgradeCap: '25'
   maneuver: tank
   name: Hog
-  planeName: assaultClassPlane
+  planeName: tankClassPlane
   portrait: classBlueprint_hog
   sortKey: '80'
   startingItems:
   - item: machinegun_0
     slot: MainGun
@@ -899,10 +899,20 @@ tank:
     unlockItemId: playerclass_hog_varianta
   - hideIfLocked: 'true'
     id: VariantB
     prefab: PlayerHog
     unlockItemId: playerclass_hog_variantb
+  - cloudOverride: poisonBlastFXPremium
+    extraColor1: ebddc3
+    extraColor2: 1c1a26
+    extraColor3: 1c1a26
+    hideIfLocked: 'true'
+    id: EpicA
+    livery: ghost.hog
+    prefab: PlayerHogVariantB
+    superTrail: SuperSpeedAfterburn
+    unlockItemId: playerclass_hog_epica
 walker:
   additionalTutorial: DungeonTutorialWalker2
   allowedItemTags:
   - machinegun
   - damageboost_blast
@@ -975,11 +985,11 @@ walker:
     hideIfLocked: 'true'
     id: VariantB
     prefab: PlayerWalkerVariantB
     unlockItemId: playerclass_walker_variantb
   - cloudOverride: damageBlastFXPremium
-    extraColor1: ecd19e
+    extraColor1: ebddc3
     extraColor2: 1c1a26
     extraColor3: 1c1a26
     hideIfLocked: 'true'
     id: EpicA
     livery: ghost.walker
diff --git config_180625_1904/quick_chat.txt config_180702_1804/quick_chat.txt
index a584e7e..0465559 100644
--- config_180625_1904/quick_chat.txt
+++ config_180702_1804/quick_chat.txt
@@ -48,10 +48,16 @@ PurpleFireworks:
 RRR:
   duration: '3'
   isInUILayer: 'true'
   prefabName: QuickChat_RRR
   unlock_item_id: emote_rrr
+ThumbsUp:
+  duration: '1.5'
+  hidden: 'false'
+  isInUILayer: 'true'
+  prefabName: QuickChat_ThumbsUp
+  unlock_item_id: emote_thumbsup
 Wings:
   duration: '3'
   isInUILayer: 'false'
   prefabName: QuickChat_Wings
   unlock_item_id: emote_wings
diff --git config_180625_1904/sounds.txt config_180702_1804/sounds.txt
index df24de2..cf82635 100644
--- config_180625_1904/sounds.txt
+++ config_180702_1804/sounds.txt
@@ -1,5 +1,9 @@
+ambientTracks:
+  Dungeon: amb_overworld_wind01
+  Nexus: amb_rebelcity_land_loop
+  World: amb_overworld_wind01
 enemyBigThreshold: '1.99'
 enemyBulletInstantSuffix: ''
 enemyBulletLongLifeSuffix: _3
 enemyBulletLongLifetime: '5'
 enemyBulletMidLifeSuffix: _2
@@ -12,11 +16,21 @@ enemyFarSmallBullet: Enemy bullet fast small
 enemyMidThreshold: '1.49'
 enemyNearBigBullet: Enemy bullet slow large
 enemyNearMidBullet: Enemy bullet slow medium
 enemyNearSmallBullet: Enemy bullet slow small
 enemyRangeThreshold: '3.5'
+generalMusicTracks:
+  Nexus: music_rebelcitylayer_general_loop
+lastShotInClipSamples:
+  default: Last Shot In Clip - machinegun
 minGuninterval: '0.05'
+reloadIsChargingSamples:
+  default: Reload is charging - machinegun
+  sniper: Reload is charging - sniper
+reloadedSamples:
+  default: Reloaded - machinegun
+  sniper: Reloaded - sniper
 samples:
   Explosion: Explosion medium
   ExplosionBig: Explosion large
   ExplosionBig2: Explosion large
   ExplosionBig_NoDebris: Explosion large
diff --git config_180625_1904/store.txt config_180702_1804/store.txt
index c33ce1a..17b6902 100644
--- config_180625_1904/store.txt
+++ config_180702_1804/store.txt
@@ -1807,10 +1807,19 @@ products:
     amount: '15000'
     currency: gold
   tags:
   - item_variant
   - item_variant_epic
+- id: store_unlock_playerclass_hog_epica
+  items:
+  - unlock_playerclass_hog_epica
+  normal_price:
+    amount: '15000'
+    currency: gold
+  tags:
+  - item_variant
+  - item_variant_epic
 - icon: ItemCrate
   id: unlock_medic
   max_per_account: '1'
   max_per_account_count_account_items: 'false'
   max_per_account_count_items: 'false'
@@ -1827,10 +1836,11 @@ products:
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
   normal_price:
     amount: '123'
     currency: gold
+  preRelease: 'true'
   preview_camera_direction:
   - '0'
   - '1'
   - '0'
   preview_camera_offset:
@@ -1856,10 +1866,11 @@ products:
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
   normal_price:
     amount: '123'
     currency: gold
+  preRelease: 'true'
   preview_camera_direction:
   - '0'
   - '1'
   - '0'
   preview_camera_offset:
@@ -1885,10 +1896,11 @@ products:
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
   normal_price:
     amount: '123'
     currency: gold
+  preRelease: 'true'
   preview_camera_direction:
   - '0'
   - '0'
   - '1'
   preview_camera_offset:
@@ -1914,10 +1926,11 @@ products:
   max_per_account: '1'
   max_per_account_count_unlocks: 'true'
   normal_price:
     amount: '123'
     currency: gold
+  preRelease: 'true'
   preview_camera_direction:
   - '0'
   - '0.5'
   - '1'
   preview_camera_offset:
@@ -1936,10 +1949,41 @@ products:
   tags:
   - unlocks
   - emotes
   unlocks:
   - emote_wings
+- icon: ItemUnlock
+  id: unlock_emote_thumbsup
+  max_per_account: '1'
+  max_per_account_count_unlocks: 'true'
+  normal_price:
+    amount: '123'
+    currency: gold
+  preRelease: 'true'
+  preview_camera_direction:
+  - '0'
+  - '0'
+  - '1'
+  preview_camera_offset:
+  - '0'
+  - '-30'
+  - '0'
+  preview_clipping_area: '80'
+  preview_distance: '300'
+  preview_prefab_name: QuickChat_ThumbsUp
+  preview_prefab_pool: UI
+  preview_reenable_timeout: '2'
+  preview_rotation_speed: '0'
+  preview_target_offset:
+  - '0'
+  - '60'
+  - '0'
+  tags:
+  - unlocks
+  - emotes
+  unlocks:
+  - emote_thumbsup
 stores:
 - id: store_hangar
   sections:
   - id: general_banner
     max_product_count: '1'
diff --git config_180625_1904/unitPaletteTextures.txt config_180702_1804/unitPaletteTextures.txt
index c3f6ff3..4d5faae 100644
--- config_180625_1904/unitPaletteTextures.txt
+++ config_180702_1804/unitPaletteTextures.txt
@@ -51,10 +51,13 @@ EnemyEstateGuard: enemyPal_mountain
 EnemyFighter: enemyPal_lowlands1
 EnemyFivestar: enemyPal_ruins
 EnemyFivestarleader: enemyPal_ruins
 EnemyFlamer: enemyPal_lowlands1
 EnemyFoxtrot: enemyPal_lowlands1
+EnemyGasstationCommand: enemyPalette_Gasstation
+EnemyGasstationGastank: enemyPalette_Gasstation
+EnemyGasstationTurret: enemyPalette_Gasstation
 EnemyGhostTrainA: enemyPal_midlands2
 EnemyGhostTrainB: enemyPal_midlands2
 EnemyGhostship: enemyPal_midlands2
 EnemyGhostshipghost1: enemyPal_midlands2
 EnemyGrid: enemyPal_lowlands1