 136 files changed, 5083 insertions(+), 743 deletions(-)

diff --git config_181210_2101/Items/Consumables/variant.txt config_190111_2315/Items/Consumables/variant.txt
index de726f7..be875c8 100644
--- config_181210_2101/Items/Consumables/variant.txt
+++ config_190111_2315/Items/Consumables/variant.txt
@@ -400,10 +400,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: rapier
+      variantId: Tiger
+  - unlock:
+      item_id: playerclass_raptor_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_raptor_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: rapier
       variantId: VariantA
   - unlock:
       item_id: playerclass_raptor_varianta
       text: action_info_unlock_short
   extraTags:
@@ -432,10 +448,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: rapier
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_raptor_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_raptor_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: rapier
       variantId: EpicA
   - unlock:
       item_id: playerclass_raptor_epica
       text: action_info_unlock_short
   extraTags:
@@ -447,10 +479,58 @@
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: rapier
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_raptor_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_raptor_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: rapier
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_raptor_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_raptor_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: rapier
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_raptor_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_raptor_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
       planeClass: tank
       variantId: flames
   - unlock:
       item_id: playerclass_hog_flames
       text: action_info_unlock_short
@@ -496,10 +576,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: tank
+      variantId: Tiger
+  - unlock:
+      item_id: playerclass_hog_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_hog_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: tank
       variantId: VariantA
   - unlock:
       item_id: playerclass_hog_varianta
       text: action_info_unlock_short
   extraTags:
@@ -528,10 +624,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: tank
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_hog_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_hog_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: tank
       variantId: EpicA
   - unlock:
       item_id: playerclass_hog_epica
       text: action_info_unlock_short
   extraTags:
@@ -543,10 +655,58 @@
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: tank
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_hog_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_hog_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: tank
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_hog_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_hog_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: tank
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_hog_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_hog_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
       planeClass: walker
       variantId: flames
   - unlock:
       item_id: playerclass_walker_flames
       text: action_info_unlock_short
@@ -592,10 +752,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: walker
+      variantId: Tiger
+  - unlock:
+      item_id: playerclass_walker_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_walker_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: walker
       variantId: VariantA
   - unlock:
       item_id: playerclass_walker_varianta
       text: action_info_unlock_short
   extraTags:
@@ -624,10 +800,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: walker
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_walker_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_walker_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: walker
       variantId: EpicA
   - unlock:
       item_id: playerclass_walker_epica
       text: action_info_unlock_short
   extraTags:
@@ -639,10 +831,58 @@
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: walker
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_walker_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_walker_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: walker
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_walker_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_walker_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: walker
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_walker_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_walker_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
       planeClass: oldfaithful
       variantId: flames
   - unlock:
       item_id: playerclass_oldfaithful_flames
       text: action_info_unlock_short
@@ -864,10 +1104,26 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: duster
+      variantId: Tiger
+  - unlock:
+      item_id: playerclass_duster_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_duster_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: duster
       variantId: VariantA
   - unlock:
       item_id: playerclass_duster_varianta
       text: action_info_unlock_short
   extraTags:
@@ -896,499 +1152,1315 @@
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: duster
-      variantId: EpicA
+      variantId: Camo
   - unlock:
-      item_id: playerclass_duster_epica
+      item_id: playerclass_duster_camo
       text: action_info_unlock_short
   extraTags:
   - variant
-  - epic
+  - rare
   icon: ItemVariant
-  id: unlock_playerclass_duster_epica
+  id: unlock_playerclass_duster_camo
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: support
-      variantId: flames
+      planeClass: duster
+      variantId: EpicA
   - unlock:
-      item_id: playerclass_shieldmaiden_flames
+      item_id: playerclass_duster_epica
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_shieldmaiden_flames
+  id: unlock_playerclass_duster_epica
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: support
-      variantId: spikes
+      planeClass: duster
+      variantId: EpicB
   - unlock:
-      item_id: playerclass_shieldmaiden_spikes
+      item_id: playerclass_duster_epicb
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_shieldmaiden_spikes
+  id: unlock_playerclass_duster_epicb
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: support
-      variantId: stars
+      planeClass: duster
+      variantId: EpicC
   - unlock:
-      item_id: playerclass_shieldmaiden_stars
+      item_id: playerclass_duster_epicc
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_shieldmaiden_stars
+  id: unlock_playerclass_duster_epicc
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: support
-      variantId: VariantA
+      planeClass: duster
+      variantId: EpicD
   - unlock:
-      item_id: playerclass_shieldmaiden_varianta
+      item_id: playerclass_duster_epicd
       text: action_info_unlock_short
   extraTags:
   - variant
-  - rare
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_shieldmaiden_varianta
+  id: unlock_playerclass_duster_epicd
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: support
-      variantId: VariantB
+      variantId: flames
   - unlock:
-      item_id: playerclass_shieldmaiden_variantb
+      item_id: playerclass_shieldmaiden_flames
       text: action_info_unlock_short
   extraTags:
   - variant
-  - rare
+  - common
   icon: ItemVariant
-  id: unlock_playerclass_shieldmaiden_variantb
+  id: unlock_playerclass_shieldmaiden_flames
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
       planeClass: support
-      variantId: EpicA
+      variantId: spikes
   - unlock:
-      item_id: playerclass_shieldmaiden_epica
+      item_id: playerclass_shieldmaiden_spikes
       text: action_info_unlock_short
   extraTags:
   - variant
-  - epic
+  - common
   icon: ItemVariant
-  id: unlock_playerclass_shieldmaiden_epica
+  id: unlock_playerclass_shieldmaiden_spikes
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: paladin
-      variantId: flames
+      planeClass: support
+      variantId: stars
   - unlock:
-      item_id: playerclass_paladin_flames
+      item_id: playerclass_shieldmaiden_stars
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_paladin_flames
+  id: unlock_playerclass_shieldmaiden_stars
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: paladin
-      variantId: spikes
+      planeClass: support
+      variantId: Tiger
   - unlock:
-      item_id: playerclass_paladin_spikes
+      item_id: playerclass_shieldmaiden_tiger
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_paladin_spikes
+  id: unlock_playerclass_shieldmaiden_tiger
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: paladin
-      variantId: stars
+      planeClass: support
+      variantId: VariantA
   - unlock:
-      item_id: playerclass_paladin_stars
+      item_id: playerclass_shieldmaiden_varianta
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - rare
   icon: ItemVariant
-  id: unlock_playerclass_paladin_stars
+  id: unlock_playerclass_shieldmaiden_varianta
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: paladin
-      variantId: VariantA
+      planeClass: support
+      variantId: VariantB
   - unlock:
-      item_id: playerclass_paladin_varianta
+      item_id: playerclass_shieldmaiden_variantb
       text: action_info_unlock_short
   extraTags:
   - variant
   - rare
   icon: ItemVariant
-  id: unlock_playerclass_paladin_varianta
+  id: unlock_playerclass_shieldmaiden_variantb
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: paladin
-      variantId: VariantB
+      planeClass: support
+      variantId: Camo
   - unlock:
-      item_id: playerclass_paladin_variantb
+      item_id: playerclass_shieldmaiden_camo
       text: action_info_unlock_short
   extraTags:
   - variant
   - rare
   icon: ItemVariant
-  id: unlock_playerclass_paladin_variantb
+  id: unlock_playerclass_shieldmaiden_camo
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: paladin
+      planeClass: support
       variantId: EpicA
   - unlock:
-      item_id: playerclass_paladin_epica
+      item_id: playerclass_shieldmaiden_epica
       text: action_info_unlock_short
   extraTags:
   - variant
   - epic
   icon: ItemVariant
-  id: unlock_playerclass_paladin_epica
+  id: unlock_playerclass_shieldmaiden_epica
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: wizard
+      planeClass: support
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_shieldmaiden_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_shieldmaiden_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: support
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_shieldmaiden_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_shieldmaiden_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: support
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_shieldmaiden_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_shieldmaiden_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: paladin
       variantId: flames
   - unlock:
-      item_id: playerclass_merlin_flames
+      item_id: playerclass_paladin_flames
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_merlin_flames
+  id: unlock_playerclass_paladin_flames
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: wizard
+      planeClass: paladin
       variantId: spikes
   - unlock:
-      item_id: playerclass_merlin_spikes
+      item_id: playerclass_paladin_spikes
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_merlin_spikes
+  id: unlock_playerclass_paladin_spikes
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: wizard
+      planeClass: paladin
       variantId: stars
   - unlock:
-      item_id: playerclass_merlin_stars
+      item_id: playerclass_paladin_stars
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_merlin_stars
+  id: unlock_playerclass_paladin_stars
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: wizard
-      variantId: VariantA
+      planeClass: paladin
+      variantId: Tiger
   - unlock:
-      item_id: playerclass_merlin_varianta
+      item_id: playerclass_paladin_tiger
       text: action_info_unlock_short
   extraTags:
   - variant
-  - rare
+  - common
   icon: ItemVariant
-  id: unlock_playerclass_merlin_varianta
+  id: unlock_playerclass_paladin_tiger
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: wizard
-      variantId: VariantB
+      planeClass: paladin
+      variantId: VariantA
   - unlock:
-      item_id: playerclass_merlin_variantb
+      item_id: playerclass_paladin_varianta
       text: action_info_unlock_short
   extraTags:
   - variant
   - rare
   icon: ItemVariant
-  id: unlock_playerclass_merlin_variantb
+  id: unlock_playerclass_paladin_varianta
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: wizard
-      variantId: EpicA
+      planeClass: paladin
+      variantId: VariantB
   - unlock:
-      item_id: playerclass_merlin_epica
+      item_id: playerclass_paladin_variantb
       text: action_info_unlock_short
   extraTags:
   - variant
-  - epic
+  - rare
   icon: ItemVariant
-  id: unlock_playerclass_merlin_epica
+  id: unlock_playerclass_paladin_variantb
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: engineer
-      variantId: flames
+      planeClass: paladin
+      variantId: Camo
   - unlock:
-      item_id: playerclass_engineer_flames
+      item_id: playerclass_paladin_camo
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - rare
   icon: ItemVariant
-  id: unlock_playerclass_engineer_flames
+  id: unlock_playerclass_paladin_camo
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: engineer
-      variantId: spikes
+      planeClass: paladin
+      variantId: EpicA
   - unlock:
-      item_id: playerclass_engineer_spikes
+      item_id: playerclass_paladin_epica
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_engineer_spikes
+  id: unlock_playerclass_paladin_epica
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: engineer
-      variantId: stars
+      planeClass: paladin
+      variantId: EpicB
   - unlock:
-      item_id: playerclass_engineer_stars
+      item_id: playerclass_paladin_epicb
       text: action_info_unlock_short
   extraTags:
   - variant
-  - common
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_engineer_stars
+  id: unlock_playerclass_paladin_epicb
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: engineer
-      variantId: VariantA
+      planeClass: paladin
+      variantId: EpicC
   - unlock:
-      item_id: playerclass_engineer_varianta
+      item_id: playerclass_paladin_epicc
       text: action_info_unlock_short
   extraTags:
   - variant
-  - rare
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_engineer_varianta
+  id: unlock_playerclass_paladin_epicc
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: engineer
-      variantId: VariantB
+      planeClass: paladin
+      variantId: EpicD
   - unlock:
-      item_id: playerclass_engineer_variantb
+      item_id: playerclass_paladin_epicd
       text: action_info_unlock_short
   extraTags:
   - variant
-  - rare
+  - epic
   icon: ItemVariant
-  id: unlock_playerclass_engineer_variantb
+  id: unlock_playerclass_paladin_epicd
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: engineer
-      variantId: EpicA
+      planeClass: wizard
+      variantId: flames
   - unlock:
-      item_id: playerclass_engineer_epica
+      item_id: playerclass_merlin_flames
       text: action_info_unlock_short
   extraTags:
   - variant
-  - epic
+  - common
   icon: ItemVariant
-  id: unlock_playerclass_engineer_epica
+  id: unlock_playerclass_merlin_flames
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: pirate
-      variantId: flames
+      planeClass: wizard
+      variantId: spikes
   - unlock:
-      item_id: playerclass_bandit_flames
+      item_id: playerclass_merlin_spikes
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_bandit_flames
+  id: unlock_playerclass_merlin_spikes
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: pirate
-      variantId: spikes
+      planeClass: wizard
+      variantId: stars
   - unlock:
-      item_id: playerclass_bandit_spikes
+      item_id: playerclass_merlin_stars
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_bandit_spikes
+  id: unlock_playerclass_merlin_stars
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: pirate
-      variantId: stars
+      planeClass: wizard
+      variantId: Tiger
   - unlock:
-      item_id: playerclass_bandit_stars
+      item_id: playerclass_merlin_tiger
       text: action_info_unlock_short
   extraTags:
   - variant
   - common
   icon: ItemVariant
-  id: unlock_playerclass_bandit_stars
+  id: unlock_playerclass_merlin_tiger
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: pirate
+      planeClass: wizard
       variantId: VariantA
   - unlock:
-      item_id: playerclass_bandit_varianta
+      item_id: playerclass_merlin_varianta
       text: action_info_unlock_short
   extraTags:
   - variant
   - rare
   icon: ItemVariant
-  id: unlock_playerclass_bandit_varianta
+  id: unlock_playerclass_merlin_varianta
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: pirate
+      planeClass: wizard
       variantId: VariantB
   - unlock:
-      item_id: playerclass_bandit_variantb
+      item_id: playerclass_merlin_variantb
       text: action_info_unlock_short
   extraTags:
   - variant
   - rare
   icon: ItemVariant
-  id: unlock_playerclass_bandit_variantb
+  id: unlock_playerclass_merlin_variantb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: wizard
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_merlin_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_merlin_camo
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
       ignoresRequirementsAndTriesToApply: 'true'
-      planeClass: bandit
+      planeClass: wizard
       variantId: EpicA
   - unlock:
-      item_id: playerclass_bandit_epica
+      item_id: playerclass_merlin_epica
       text: action_info_unlock_short
   extraTags:
   - variant
   - epic
   icon: ItemVariant
-  id: unlock_playerclass_bandit_epica
+  id: unlock_playerclass_merlin_epica
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: wizard
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_merlin_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_merlin_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: wizard
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_merlin_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_merlin_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: wizard
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_merlin_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_merlin_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: flames
+  - unlock:
+      item_id: playerclass_engineer_flames
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_flames
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: spikes
+  - unlock:
+      item_id: playerclass_engineer_spikes
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_spikes
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: stars
+  - unlock:
+      item_id: playerclass_engineer_stars
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_stars
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: Tiger
+  - unlock:
+      item_id: playerclass_engineer_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: VariantA
+  - unlock:
+      item_id: playerclass_engineer_varianta
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_varianta
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: VariantB
+  - unlock:
+      item_id: playerclass_engineer_variantb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_variantb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_engineer_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: EpicA
+  - unlock:
+      item_id: playerclass_engineer_epica
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_epica
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_engineer_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_engineer_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: engineer
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_engineer_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_engineer_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: flames
+  - unlock:
+      item_id: playerclass_bandit_flames
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_flames
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: spikes
+  - unlock:
+      item_id: playerclass_bandit_spikes
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_spikes
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: stars
+  - unlock:
+      item_id: playerclass_bandit_stars
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_stars
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: Tiger
+  - unlock:
+      item_id: playerclass_bandit_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: VariantA
+  - unlock:
+      item_id: playerclass_bandit_varianta
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_varianta
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: VariantB
+  - unlock:
+      item_id: playerclass_bandit_variantb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_variantb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_bandit_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: EpicA
+  - unlock:
+      item_id: playerclass_bandit_epica
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_epica
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_bandit_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_bandit_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: pirate
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_bandit_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_bandit_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: flames
+  - unlock:
+      item_id: playerclass_daggerknight_flames
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_flames
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: spikes
+  - unlock:
+      item_id: playerclass_daggerknight_spikes
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_spikes
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: stars
+  - unlock:
+      item_id: playerclass_daggerknight_stars
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_stars
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: tiger
+  - unlock:
+      item_id: playerclass_daggerknight_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - unlock:
+      item_id: playerclass_daggerknight_varianta
+      text: action_info_unlock_short
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: VariantA
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_varianta
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: VariantB
+  - unlock:
+      item_id: playerclass_daggerknight_variantb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_variantb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_daggerknight_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: EpicA
+  - unlock:
+      item_id: playerclass_daggerknight_epica
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_epica
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_daggerknight_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_daggerknight_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: daggerknight
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_daggerknight_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_daggerknight_epicd
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: flames
+  - unlock:
+      item_id: playerclass_siegetank_flames
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_flames
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: spikes
+  - unlock:
+      item_id: playerclass_siegetank_spikes
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_spikes
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: stars
+  - unlock:
+      item_id: playerclass_siegetank_stars
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_stars
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: tiger
+  - unlock:
+      item_id: playerclass_siegetank_tiger
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - common
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_tiger
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - unlock:
+      item_id: playerclass_siegetank_varianta
+      text: action_info_unlock_short
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: VariantA
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_varianta
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: VariantB
+  - unlock:
+      item_id: playerclass_siegetank_variantb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_variantb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: Camo
+  - unlock:
+      item_id: playerclass_siegetank_camo
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - rare
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_camo
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: EpicA
+  - unlock:
+      item_id: playerclass_siegetank_epica
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_epica
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: EpicB
+  - unlock:
+      item_id: playerclass_siegetank_epicb
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_epicb
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: EpicC
+  - unlock:
+      item_id: playerclass_siegetank_epicc
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_epicc
+  slot: ConsumableAction
+  soulbound: 'true'
+  uses: '1'
+- actions:
+  - variant:
+      ignoresRequirementsAndTriesToApply: 'true'
+      planeClass: siegetank
+      variantId: EpicD
+  - unlock:
+      item_id: playerclass_siegetank_epicd
+      text: action_info_unlock_short
+  extraTags:
+  - variant
+  - epic
+  icon: ItemVariant
+  id: unlock_playerclass_siegetank_epicd
   slot: ConsumableAction
   soulbound: 'true'
   uses: '1'
 - actions:
   - variant:
diff --git config_190111_2315/Items/Primary Weapons/machinegun_minigun_basic.txt config_190111_2315/Items/Primary Weapons/machinegun_minigun_basic.txt
new file mode 100644
index 0000000..be18d1a
--- /dev/null
+++ config_190111_2315/Items/Primary Weapons/machinegun_minigun_basic.txt	
@@ -0,0 +1,383 @@
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: green
+      bulletPalette: tight
+      bulletPrefab: tracerBullet
+      bulletSize: '0.22400000000000003'
+      burst: '180'
+      cooldown: '3'
+      damage: '1.5'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '2'
+      multiSpread: '0'
+      name: mg0_1
+      rof: '15'
+      speed: '24.0'
+      spread: '12'
+    mountName: MG0_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_0
+  id: machinegun_minigun_0
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: green
+      bulletPalette: tight
+      bulletPrefab: tracerBullet
+      bulletSize: '0.316344'
+      burst: '180'
+      cooldown: '3'
+      damage: '2.34'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '2'
+      multiSpread: '0'
+      name: mg1_1
+      rof: '15'
+      speed: '24.0'
+      spread: '12'
+    mountName: MG1_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_1
+  id: machinegun_minigun_1
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: green
+      bulletPalette: glow
+      bulletPrefab: tracerBullet
+      bulletSize: '0.321984'
+      burst: '180'
+      cooldown: '3'
+      damage: '3.17'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '2'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg2_1
+      rof: '15'
+      speed: '24.0'
+      spread: '12'
+    mountName: MG2_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_2
+  id: machinegun_minigun_2
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - fireMode: SprinklerTurnback
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: green
+      bulletPalette: tight
+      bulletPrefab: tracerBullet
+      bulletSize: '0.32505200000000006'
+      burst: '180'
+      cooldown: '3'
+      damage: '4.00'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '2'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg3_1
+      rof: '15'
+      speed: '24.0'
+      spread: '0'
+    mountName: MG3_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+    sprinklerFlyback: 'false'
+    sprinklerIncrementAngle: '2'
+    sprinklerStartAngle: '-10'
+    sprinklerTurnbackAngle: '10'
+  icon: ItemLootmachinegun_3
+  id: machinegun_minigun_3
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - fireMode: SprinklerTurnback
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: green
+      bulletPalette: ringing
+      bulletPrefab: tracerBullet
+      bulletSize: '0.32567999999999997'
+      burst: '180'
+      cooldown: '3'
+      damage: '4.83'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '2'
+      multiSpread: '0'
+      name: mg4_1
+      rof: '15'
+      speed: '24.0'
+      spread: '0'
+    mountName: MG4_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+    sprinklerFlyback: 'false'
+    sprinklerIncrementAngle: '2'
+    sprinklerStartAngle: '-20'
+    sprinklerTurnbackAngle: '20'
+  icon: ItemLootmachinegun_4
+  id: machinegun_minigun_4
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: blue
+      bulletPalette: glow
+      bulletPrefab: tracerBullet
+      bulletSize: '0.324'
+      burst: '180'
+      cooldown: '6'
+      damage: '6.33'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '3'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg5_1
+      rof: '15'
+      speed: '24.0'
+      spread: '7'
+    mountName: MG5_mini_mount
+    offset:
+    - '0'
+    - '0'
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_5
+  id: machinegun_minigun_5
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: blue
+      bulletPalette: tight
+      bulletPrefab: tracerBullet
+      bulletSize: '0.301312'
+      burst: '180'
+      cooldown: '6'
+      damage: '7.25'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '3'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg6_1
+      rof: '15'
+      speed: '24.0'
+      spread: '4'
+    mountName: MG6_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_6
+  id: machinegun_minigun_6
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: blue
+      bulletPalette: halo
+      bulletPrefab: tracerBullet
+      bulletSize: '0.314244'
+      burst: '180'
+      cooldown: '6'
+      damage: '8.15'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '3'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg7_1
+      rof: '15'
+      speed: '24.0'
+      spread: '6'
+    mountName: MG7_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_7
+  id: machinegun_minigun_7
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - fireMode: SprinklerTurnback
+    flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: glow
+      bulletPrefab: tracerBullet
+      bulletSize: '0.30643200000000004'
+      burst: '180'
+      cooldown: '6'
+      damage: '9.10'
+      doesReloadNonemptyClips: 'true'
+      lifetime: '0.25'
+      multi: '3'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg8_1
+      rof: '15'
+      speed: '24.0'
+      spread: '7'
+    mountName: MG8_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+    sprinklerFlyback: 'false'
+    sprinklerIncrementAngle: '2'
+    sprinklerStartAngle: '-10'
+    sprinklerTurnbackAngle: '10'
+  icon: ItemLootmachinegun_8
+  id: machinegun_minigun_8
+  slot: MainGun
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: ringing
+      bulletPrefab: tracerBullet
+      bulletSize: '0.29684'
+      burst: '180'
+      cooldown: '6'
+      damage: '7.50'
+      doesReloadNonemptyClips: 'true'
+      effect: Poison
+      effectAmount: '0.1'
+      effectDamage: '2.50'
+      effectTime: '0.1'
+      lifetime: '0.25'
+      multi: '3'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg9_1
+      rof: '15'
+      speed: '24.0'
+      spread: '12'
+    mountIdOverride: '0003'
+    mountName: MG9_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_9
+  id: machinegun_minigun_9
+  slot: MainGun
+  soulbound: 'true'
+  tag: machinegun_minigun
+  tier: '100'
+- gunMounts:
+  - flashOffset: '0.4'
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: ringing_white
+      bulletPrefab: tracerBullet
+      bulletSize: '0.2992000000000001'
+      burst: '180'
+      cooldown: '6'
+      damage: '8.24'
+      doesReloadNonemptyClips: 'true'
+      effect: Lightning
+      effectAmount: '0.1'
+      effectDamage: '2.75'
+      effectTime: '0.1'
+      lifetime: '0.25'
+      multi: '3'
+      multiOffset:
+      - '0'
+      - '0'
+      multiSpread: '0'
+      name: mg10_1
+      rof: '15'
+      speed: '24.0'
+      spread: '12'
+    mountName: MG10_mini_mount
+    sfx:
+      pitch: '2'
+      sound: shotgun
+      soundMinInterval:
+      - '0.02'
+      - '0.05'
+  icon: ItemLootmachinegun_10
+  id: machinegun_minigun_10
+  slot: MainGun
+  soulbound: 'true'
+  tag: machinegun_minigun
+  tier: '100'
diff --git config_190111_2315/Items/Primary Weapons/siege_basic.txt config_190111_2315/Items/Primary Weapons/siege_basic.txt
new file mode 100644
index 0000000..b08f024
--- /dev/null
+++ config_190111_2315/Items/Primary Weapons/siege_basic.txt	
@@ -0,0 +1,34 @@
+- actions:
+  - cloud: damageboost_siege0
+  icon: ItemLootSiege_0
+  id: siege_permanent_0
+  slot: ManeuverGun
+  statMods:
+  - amount: '1.5'
+    math: multiply
+    name: gunDamageMod
+  - amount: '4.5'
+    math: multiply
+    name: gunRangeMod
+  tag: siege
+  tier: '999'
+- actions:
+  - maneuver:
+      cooldown: '0.2'
+      count: '3'
+      distance: '2.6'
+      energy: '1'
+      name: flak
+      scale: '1.5'
+      secondsToVelocity1: '0.2'
+      spreadX: '1'
+      spreadY: '2'
+  icon: ItemLootVortex_0
+  id: flak_0
+  slot: SecondaryAttack
+  statMods:
+  - amount: '1'
+    math: add
+    name: energyRegenRate
+  tag: flak
+  tier: '0'
diff --git config_181210_2101/Items/Secondary Weapons/cloud.txt config_190111_2315/Items/Secondary Weapons/cloud.txt
index 6f63eb2..c33a2ac 100644
--- config_181210_2101/Items/Secondary Weapons/cloud.txt	
+++ config_190111_2315/Items/Secondary Weapons/cloud.txt	
@@ -240,22 +240,235 @@
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '4'
       mods:
-      - amount: '0.33'
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
         math: multiply
         name: gunRangeMod
-      - amount: '0.33'
+      - amount: '0.25'
         math: multiply
         name: gunCooldownMod
   icon: ItemLootBlast_Shield_0
   id: shield_blast_0
   slot: SecondaryAttack
   tag: shield_blast
   tier: '0'
 - actions:
+  - cloud: shieldblast1
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_1
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '1'
+- actions:
+  - cloud: shieldblast2
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_2
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '2'
+- actions:
+  - cloud: shieldblast3
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_3
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '3'
+- actions:
+  - cloud: shieldblast4
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_4
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '4'
+- actions:
+  - cloud: shieldblast5
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_5
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '5'
+- actions:
+  - cloud: shieldblast6
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_6
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '6'
+- actions:
+  - cloud: shieldblast7
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_7
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '7'
+- actions:
+  - cloud: shieldblast8
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_8
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '8'
+- actions:
+  - cloud: shieldblast9
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_9
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '9'
+- actions:
+  - cloud: shieldblast10
+  - buff:
+      cooldown: '4'
+      cost: '0'
+      duration: '4'
+      mods:
+      - amount: '1.33'
+        math: multiply
+        name: gunDamageMod
+      - amount: '0.25'
+        math: multiply
+        name: gunRangeMod
+      - amount: '0.25'
+        math: multiply
+        name: gunCooldownMod
+  icon: ItemLootBlast_Shield_0
+  id: shield_blast_10
+  slot: SecondaryAttack
+  tag: shield_blast
+  tier: '10'
+- actions:
   - cloud: damageboostblast0
   icon: ItemLootBlast_DamageBoost_0
   id: damageboost_blast_0
   slot: SecondaryAttack
   tag: damageboost_blast
@@ -413,11 +626,10 @@
   tier: '10'
 - actions:
   - cloud: damageaura0
   icon: ItemLootCloud_Damage_0
   id: damage_aura_0
-  preRelease: 'true'
   slot: SecondaryAttack
   tag: cloud_damage
   tier: '0'
 - actions:
   - cloud: resistaura0
diff --git config_181210_2101/Items/armor/spinattack_7.txt config_190111_2315/Items/armor/spinattack_7.txt
index c1e2f78..1d95041 100644
--- config_181210_2101/Items/armor/spinattack_7.txt
+++ config_190111_2315/Items/armor/spinattack_7.txt
@@ -1,5 +1,6 @@
+icon: ItemLootShieldSpinAttack_7
 id: spinattack_7
 slot: Armor
 statMods:
 - amount: '3'
   math: add
diff --git config_181210_2101/Quests/quests_crafting.txt config_190111_2315/Quests/quests_crafting.txt
index 1db7fbb..0cb24ad 100644
--- config_181210_2101/Quests/quests_crafting.txt
+++ config_190111_2315/Quests/quests_crafting.txt
@@ -5,1925 +5,2080 @@
   replayInstance: immediate
   source: giver
   template: 'true'
   tier: '-1'
   type: crafting
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: laser_lightning_8
     target: '1'
     type: collect
   id: fusion_laser_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: laser_lightning_9
     target: '1'
     type: collect
   id: fusion_laser_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: machinegun_lightning_8
     target: '1'
     type: collect
   id: fusion_machinegun_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: machinegun_lightning_9
     target: '1'
     type: collect
   id: fusion_machinegun_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_lightning_8
     target: '1'
     type: collect
   id: fusion_shotgun_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_lightning_9
     target: '1'
     type: collect
   id: fusion_shotgun_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: sniper_lightning_8
     target: '1'
     type: collect
   id: fusion_sniper_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: sniper_lightning_9
     target: '1'
     type: collect
   id: fusion_sniper_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: triple_lightning_8
     target: '1'
     type: collect
   id: fusion_triple_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: triple_lightning_9
     target: '1'
     type: collect
   id: fusion_triple_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: wasp_lightning_8
     target: '1'
     type: collect
   id: fusion_wasp_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: wasp_lightning_9
     target: '1'
     type: collect
   id: fusion_wasp_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: strike_lightning_8
     target: '1'
     type: collect
   id: fusion_strike_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: strike_lightning_9
     target: '1'
     type: collect
   id: fusion_strike_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: sword_lightning_8
     target: '1'
     type: collect
   id: fusion_sword_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: sword_lightning_9
     target: '1'
     type: collect
   id: fusion_sword_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: laser_water_8
     target: '1'
     type: collect
   id: fusion_laser_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: laser_water_9
     target: '1'
     type: collect
   id: fusion_laser_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: machinegun_water_8
     target: '1'
     type: collect
   id: fusion_machinegun_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: machinegun_water_9
     target: '1'
     type: collect
   id: fusion_machinegun_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_water_8
     target: '1'
     type: collect
   id: fusion_shotgun_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_water_9
     target: '1'
     type: collect
   id: fusion_shotgun_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: sniper_water_8
     target: '1'
     type: collect
   id: fusion_sniper_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: sniper_water_9
     target: '1'
     type: collect
   id: fusion_sniper_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: triple_water_8
     target: '1'
     type: collect
   id: fusion_triple_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: triple_water_9
     target: '1'
     type: collect
   id: fusion_triple_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: wasp_water_8
     target: '1'
     type: collect
   id: fusion_wasp_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: wasp_water_9
     target: '1'
     type: collect
   id: fusion_wasp_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: strike_water_8
     target: '1'
     type: collect
   id: fusion_strike_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: strike_water_9
     target: '1'
     type: collect
   id: fusion_strike_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: sword_water_8
     target: '1'
     type: collect
   id: fusion_sword_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: sword_water_9
     target: '1'
     type: collect
   id: fusion_sword_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: laser_fire_8
     target: '1'
     type: collect
   id: fusion_laser_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: laser_fire_9
     target: '1'
     type: collect
   id: fusion_laser_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: machinegun_fire_8
     target: '1'
     type: collect
   id: fusion_machinegun_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: machinegun_fire_9
     target: '1'
     type: collect
   id: fusion_machinegun_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_fire_8
     target: '1'
     type: collect
   id: fusion_shotgun_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_fire_9
     target: '1'
     type: collect
   id: fusion_shotgun_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: sniper_fire_8
     target: '1'
     type: collect
   id: fusion_sniper_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: sniper_fire_9
     target: '1'
     type: collect
   id: fusion_sniper_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: triple_fire_8
     target: '1'
     type: collect
   id: fusion_triple_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: triple_fire_9
     target: '1'
     type: collect
   id: fusion_triple_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: wasp_fire_8
     target: '1'
     type: collect
   id: fusion_wasp_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: wasp_fire_9
     target: '1'
     type: collect
   id: fusion_wasp_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: strike_fire_8
     target: '1'
     type: collect
   id: fusion_strike_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: strike_fire_9
     target: '1'
     type: collect
   id: fusion_strike_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: sword_fire_8
     target: '1'
     type: collect
   id: fusion_sword_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: sword_fire_9
     target: '1'
     type: collect
   id: fusion_sword_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: laser_poison_8
     target: '1'
     type: collect
   id: fusion_laser_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: laser_poison_9
     target: '1'
     type: collect
   id: fusion_laser_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: machinegun_poison_8
     target: '1'
     type: collect
   id: fusion_machinegun_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: machinegun_poison_9
     target: '1'
     type: collect
   id: fusion_machinegun_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_poison_8
     target: '1'
     type: collect
   id: fusion_shotgun_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_poison_9
     target: '1'
     type: collect
   id: fusion_shotgun_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: sniper_poison_8
     target: '1'
     type: collect
   id: fusion_sniper_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: sniper_poison_9
     target: '1'
     type: collect
   id: fusion_sniper_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: triple_poison_8
     target: '1'
     type: collect
   id: fusion_triple_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: triple_poison_9
     target: '1'
     type: collect
   id: fusion_triple_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: wasp_poison_8
     target: '1'
     type: collect
   id: fusion_wasp_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: wasp_poison_9
     target: '1'
     type: collect
   id: fusion_wasp_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: strike_poison_8
     target: '1'
     type: collect
   id: fusion_strike_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: strike_poison_9
     target: '1'
     type: collect
   id: fusion_strike_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: sword_poison_8
     target: '1'
     type: collect
   id: fusion_sword_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: sword_poison_9
     target: '1'
     type: collect
   id: fusion_sword_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: laser_ice_8
     target: '1'
     type: collect
   id: fusion_laser_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: laser_ice_9
     target: '1'
     type: collect
   id: fusion_laser_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: machinegun_ice_8
     target: '1'
     type: collect
   id: fusion_machinegun_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: machinegun_ice_9
     target: '1'
     type: collect
   id: fusion_machinegun_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_ice_8
     target: '1'
     type: collect
   id: fusion_shotgun_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_ice_9
     target: '1'
     type: collect
   id: fusion_shotgun_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: sniper_ice_8
     target: '1'
     type: collect
   id: fusion_sniper_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: sniper_ice_9
     target: '1'
     type: collect
   id: fusion_sniper_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: triple_ice_8
     target: '1'
     type: collect
   id: fusion_triple_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: triple_ice_9
     target: '1'
     type: collect
   id: fusion_triple_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: wasp_ice_8
     target: '1'
     type: collect
   id: fusion_wasp_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: wasp_ice_9
     target: '1'
     type: collect
   id: fusion_wasp_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: strike_ice_8
     target: '1'
     type: collect
   id: fusion_strike_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: strike_ice_9
     target: '1'
     type: collect
   id: fusion_strike_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: sword_ice_8
     target: '1'
     type: collect
   id: fusion_sword_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: sword_ice_9
     target: '1'
     type: collect
   id: fusion_sword_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: armor_lightning_8
     target: '1'
     type: collect
   id: fusion_armor_lightning_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: armor_lightning_9
     target: '1'
     type: collect
   id: fusion_armor_lightning_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: armor_water_8
     target: '1'
     type: collect
   id: fusion_armor_water_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: armor_water_9
     target: '1'
     type: collect
   id: fusion_armor_water_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: armor_fire_8
     target: '1'
     type: collect
   id: fusion_armor_fire_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: armor_fire_9
     target: '1'
     type: collect
   id: fusion_armor_fire_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: armor_poison_8
     target: '1'
     type: collect
   id: fusion_armor_poison_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: armor_poison_9
     target: '1'
     type: collect
   id: fusion_armor_poison_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: armor_ice_8
     target: '1'
     type: collect
   id: fusion_armor_ice_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: armor_ice_9
     target: '1'
     type: collect
   id: fusion_armor_ice_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: hadouken_9
     target: '1'
     type: collect
   id: fusion_hadouken_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: laser_snake_9
     target: '1'
     type: collect
   id: fusion_laser_snake_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: machinegun_kraken_9
     target: '1'
     type: collect
   id: fusion_machinegun_kraken_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: machinegun_blizzard_9
     target: '1'
     type: collect
   id: fusion_machinegun_blizzard_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: shotgun_doomsday_9
     target: '1'
     type: collect
   id: fusion_shotgun_doomsday_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: shotgun_flat_9
     target: '1'
     type: collect
   id: fusion_shotgun_flat_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: sniper_wasp_9
     target: '1'
     type: collect
   id: fusion_sniper_wasp_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: triple_charge_9
     target: '1'
     type: collect
   id: fusion_triple_charge_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: triple_classic_9
     target: '1'
     type: collect
   id: fusion_triple_classic_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: wasp_space_9
     target: '1'
     type: collect
   id: fusion_wasp_space_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: wasp_beam_9
     target: '1'
     type: collect
   id: fusion_wasp_beam_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: wasp_zem_9
     target: '1'
     type: collect
   id: fusion_wasp_zem_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: wasp_phoenix_9
     target: '1'
     type: collect
   id: fusion_wasp_phoenix_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: wasp_kaiju_9
     target: '1'
     type: collect
   id: fusion_wasp_kaiju_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: strike_mist_9
     target: '1'
     type: collect
   id: fusion_strike_mist_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: strike_viper_9
     target: '1'
     type: collect
   id: fusion_strike_viper_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: strike_raijin_9
     target: '1'
     type: collect
   id: fusion_strike_raijin_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: sword_plasmashiv_9
     target: '1'
     type: collect
   id: fusion_sword_plasmashiv_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: sword_smoke_9
     target: '1'
     type: collect
   id: fusion_sword_smoke_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: sword_beam_9
     target: '1'
     type: collect
   id: fusion_sword_beam_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: triple_terror_9
     target: '1'
     type: collect
   id: fusion_triple_terror_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_darksteel
     target: '8'
     type: collect
   - items:
     - id: machinegun_gattling_9
     target: '1'
     type: collect
   id: fusion_machinegun_gattling_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_purplesteel
     target: '2'
     type: collect
   id: craft_laser_moon_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '2'
     type: collect
   id: craft_machinegun_wide_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '2'
     type: collect
   id: craft_shotgun_combat_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '2'
     type: collect
   id: craft_shotgun_backshot_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_redsteel
     target: '2'
     type: collect
   id: craft_sniper_side_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_whitesteel
     target: '2'
     type: collect
   id: craft_sniper_hawkeye_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_bluesteel
     target: '2'
     type: collect
   id: craft_triple_trident_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_purplesteel
     target: '2'
     type: collect
   id: craft_wasp_double_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '2'
     type: collect
   id: craft_strike_tesla_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_redsteel
     target: '2'
     type: collect
   id: craft_sword_double_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: laser_moon_8
     target: '1'
     type: collect
   id: fusion_laser_moon_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: laser_moon_9
     target: '1'
     type: collect
   id: fusion_laser_moon_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: machinegun_wide_8
     target: '1'
     type: collect
   id: fusion_machinegun_wide_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: machinegun_wide_9
     target: '1'
     type: collect
   id: fusion_machinegun_wide_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_combat_8
     target: '1'
     type: collect
   id: fusion_shotgun_combat_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_combat_9
     target: '1'
     type: collect
   id: fusion_shotgun_combat_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: shotgun_backshot_8
     target: '1'
     type: collect
   id: fusion_shotgun_backshot_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: shotgun_backshot_9
     target: '1'
     type: collect
   id: fusion_shotgun_backshot_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: sniper_side_8
     target: '1'
     type: collect
   id: fusion_sniper_side_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: sniper_side_9
     target: '1'
     type: collect
   id: fusion_sniper_side_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_whitesteel
     target: '3'
     type: collect
   - items:
     - id: sniper_hawkeye_8
     target: '1'
     type: collect
   id: fusion_sniper_hawkeye_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_whitesteel
     target: '5'
     type: collect
   - items:
     - id: sniper_hawkeye_9
     target: '1'
     type: collect
   id: fusion_sniper_hawkeye_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_bluesteel
     target: '3'
     type: collect
   - items:
     - id: triple_trident_8
     target: '1'
     type: collect
   id: fusion_triple_trident_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_bluesteel
     target: '5'
     type: collect
   - items:
     - id: triple_trident_9
     target: '1'
     type: collect
   id: fusion_triple_trident_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_purplesteel
     target: '3'
     type: collect
   - items:
     - id: wasp_double_8
     target: '1'
     type: collect
   id: fusion_wasp_double_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_purplesteel
     target: '5'
     type: collect
   - items:
     - id: wasp_double_9
     target: '1'
     type: collect
   id: fusion_wasp_double_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '3'
     type: collect
   - items:
     - id: strike_tesla_8
     target: '1'
     type: collect
   id: fusion_strike_tesla_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_yellowsteel
     target: '5'
     type: collect
   - items:
     - id: strike_tesla_9
     target: '1'
     type: collect
   id: fusion_strike_tesla_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_redsteel
     target: '3'
     type: collect
   - items:
     - id: sword_double_8
     target: '1'
     type: collect
   id: fusion_sword_double_9
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_redsteel
     target: '5'
     type: collect
   - items:
     - id: sword_double_9
     target: '1'
     type: collect
   id: fusion_sword_double_10
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: laser
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_laser_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: machinegun
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_machinegun_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: shotgun
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_shotgun_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sniper
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_sniper_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: triple
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_triple_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: wasp
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_wasp_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: strike
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_strike_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: sword
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_sword_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: armor
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_armor_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: engine
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_engine_speed_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: engine
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_engine_destruction_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: engine
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_engine_power_8
   inherit:
   - crafting_template
   rewardTier: '8'
-- goals:
+- category: engine
+  goals:
   - items:
     - id: craft_copper
     target: '2'
     type: collect
   id: craft_engine_repair_8
diff --git config_181210_2101/Quests/quests_daily.txt config_190111_2315/Quests/quests_daily.txt
index c973557..a4ff2d2 100644
--- config_181210_2101/Quests/quests_daily.txt
+++ config_190111_2315/Quests/quests_daily.txt
@@ -4,24 +4,26 @@
   - target: '1'
     type: kill
     units:
     - id: meowza
   id: dungeon_finalboss_01
+  invisible: 'true'
   joinActivateUnits:
   - meowzalasergateWE
   joinIfNoPlayers: 'true'
   joinTimeout: '1'
+  limitToLocation: DungeonFinalBoss
+  permanent: 'true'
   replayConfig: afterTimeout
   replayConfigTimeout: 0:01
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   source: trigger
   tier: '10'
-  timeLimit: 00:30
 - activateTimeout: '1'
   autoComplete: 'true'
   goals:
   - guidanceEnabled: 'false'
     target: '1'
@@ -60,21 +62,22 @@
   id: dungeon_thief_01
   joinActivateUnits:
   - thiefchest
   joinIfNoPlayers: 'true'
   joinTimeout: '1'
+  limitToLocation: DungeonThief
+  permanent: 'true'
   replayConfig: afterTimeout
   replayConfigTimeout: 0:01
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   rewardDestination: groundOnly
   source: trigger
   tier: '10'
-  timeLimit: 00:30
 - activateTimeout: '3'
   autoComplete: 'true'
   goals:
   - fallbackGuidanceTargets:
     - escortmission
@@ -110,21 +113,22 @@
     - id: escortdungeontreasure3
   id: dungeon_rescue_01
   joinActivateUnits:
   - escortmission
   joinIfNoPlayers: 'true'
+  limitToLocation: DungeonRescue
+  permanent: 'true'
   replayConfig: afterTimeout
   replayConfigTimeout: 0:01
   requirements:
     planeLevelMax: '20'
     planeLevelMin: '0'
     quests:
     - id: tut_complete
   rewardDestination: groundOnly
   source: trigger
   tier: '10'
-  timeLimit: 00:30
 - goals:
   - target: '1'
     type: kill
     units:
     - id: summonermaster
diff --git config_181210_2101/Quests/quests_tutorial.txt config_190111_2315/Quests/quests_tutorial.txt
index 022f961..602e4a6 100644
--- config_181210_2101/Quests/quests_tutorial.txt
+++ config_190111_2315/Quests/quests_tutorial.txt
@@ -1,6 +1,7 @@
-- autoComplete: 'true'
+- activateOnAcquire: 'true'
+  autoComplete: 'true'
   goals:
   - target: '3'
     type: kill
     units:
     - id: trainA01
@@ -12,25 +13,27 @@
   requirements:
     finishedTutorial: 'true'
   showInaccessible: 'false'
   source: auto
   tier: '1'
-- completeAtGiver: tavern
+- activateOnAcquire: 'true'
+  completeAtGiver: tavern
   goals: []
   id: tut_01_2
   joinTimeout: '0'
   listSortPriority: '-10000'
   permanent: 'true'
   replayConfig: never
   requirements:
     quests:
     - delay: 0:00:05
       id: tut_01
   showInaccessible: 'false'
   source: auto
   tier: '1'
-- autoComplete: 'true'
+- activateOnAcquire: 'true'
+  autoComplete: 'true'
   goals:
   - target: '1'
     type: kill
     units:
     - id: tut_02_fatblimp
@@ -44,11 +47,12 @@
     - id: tut_01_2
   rewardTier: '2'
   showInaccessible: 'false'
   source: giver
   tier: '2'
-- completeAtGiver: tavern
+- activateOnAcquire: 'true'
+  completeAtGiver: tavern
   goals:
   - dungeon:
       id: Dungeon_tut_03
     target: '1'
     type: kill
@@ -64,11 +68,12 @@
     - delay: 0:00:05
       id: tut_02
   showInaccessible: 'false'
   source: auto
   tier: '3'
-- autoComplete: 'true'
+- activateOnAcquire: 'true'
+  autoComplete: 'true'
   goals:
   - target: '1'
     type: kill
     units:
     - id: tut_04_berserker
@@ -81,11 +86,12 @@
     quests:
     - id: tut_03
   showInaccessible: 'false'
   source: giver
   tier: '3'
-- completeAtGiver: tavern
+- activateOnAcquire: 'true'
+  completeAtGiver: tavern
   goals:
   - dungeon:
       id: Dungeon_tut_05
     target: '1'
     type: kill
@@ -105,14 +111,12 @@
   tier: '3'
 - autoComplete: 'true'
   goals: []
   id: tut_complete
   invisible: 'true'
-  listSortPriority: '-10000'
   permanent: 'true'
   replayConfig: never
   requirements:
     quests:
     - id: tut_05
-  showInaccessible: 'false'
   source: auto
-  tier: '1'
+  tier: '-1'
diff --git config_181210_2101/Texts/en-US/bark.txt config_190111_2315/Texts/en-US/bark.txt
index 33b789d..51fbab8 100644
--- config_181210_2101/Texts/en-US/bark.txt
+++ config_190111_2315/Texts/en-US/bark.txt
@@ -440,10 +440,24 @@ convoytri_2:
   - text: Tri Shutdown2
 crafting_beginner:
   randomOptions:
   - text: You need to reach level 20 at least once with a plane to craft stuff. Drop by soon!
     weight: '1'
+crafting_intro:
+  randomOptions:
+  - text: 'Welcome to the Crafting Workshop!
+
+
+      You can craft some awesome items, but you''ll need the right crafting materials. Collect crafting materials from bounty quests.
+
+
+      Don''t forget to visit the pub and get today''s bounty quest!'
+    weight: '1'
+crafting_unlock:
+  randomOptions:
+  - text: Congrats on reaching level 20! In celebration we've opened up the <color=#FBB040>Crafting Workshop</color> for you in the Rebel City
+    weight: '1'
 crawlerDEATH:
   randomOptions:
   - text: 'No!
 
       The harvest must continue!'
@@ -1314,10 +1328,14 @@ spiderbossswarmer:
 sprinklesDEATH:
   randomOptions:
   - text: Politics are cruel.
   - text: One day, I will earn your vote.
   - text: The people have spoken.
+storage_intro:
+  randomOptions:
+  - text: Welcome to Storage! Leave items here and we'll keep them safe for you, even if you die... especially if you die.
+    weight: '1'
 summonermaster:
   randomOptions:
   - text: We take such good care of orphans here.
   - text: You wish to join my children?
   - text: With a nip and tuck, even YOUR brain would fit a standard chassis.
diff --git config_181210_2101/Texts/en-US/events.txt config_190111_2315/Texts/en-US/events.txt
index 0500f97..27f4a36 100644
--- config_181210_2101/Texts/en-US/events.txt
+++ config_190111_2315/Texts/en-US/events.txt
@@ -260,10 +260,16 @@ news_goslings_gravely:
   description: 'Updated input system with much better mouse support, apply variant skins to existing planes, and more!
 
     '
   header_image: EventHeader_Updates
   title: 'News: Goslings Gravely Growing Guileful'
+news_hardy_heron:
+  description: 'Last big update of 2018 and the private beta. Loads of polish improvements and bug fixes
+
+    '
+  header_image: EventHeader_Updates
+  title: 'News: Hardy Heron Halluxes'
 playtest_event:
   description: "Welcome to the latest Steambirds playtest. Be kind to one another. Explore the game. Have fun. Good skies! \n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n {0}{1}\n"
   ending_server_message: The playtest is over!
   header_image: EventHeader_Updates
   starting_server_message: Playtest is starting now!
diff --git config_181210_2101/Texts/en-US/input.txt config_190111_2315/Texts/en-US/input.txt
index 667b542..89e20ea 100644
--- config_181210_2101/Texts/en-US/input.txt
+++ config_190111_2315/Texts/en-US/input.txt
@@ -32,10 +32,11 @@ actions:
   mission_log: Mission Log
   move_down: Move Down
   move_left: Move Left
   move_right: Move Right
   move_up: Move Up
+  open_friends_list: Open Friends List
   open_trade_stall: Open Trade Stall
   options: Options
   quick_chat_a: Quick Chat A
   quick_chat_b: Quick Chat B
   quick_chat_c: Quick Chat C
diff --git config_181210_2101/Texts/en-US/lore.txt config_190111_2315/Texts/en-US/lore.txt
index 0c02205..e06038d 100644
--- config_181210_2101/Texts/en-US/lore.txt
+++ config_190111_2315/Texts/en-US/lore.txt
@@ -878,68 +878,68 @@ templedungeonsign2:
 
       written in Rodentese.'
     weight: '1'
 territory_tile_beach_seen_text: 'Now entering:
 
-  City Ruins
+  <size=150%>City Ruins
 
-  <color=#FF9900>Level 1-3'
+  <size=80%><color=#FF9900>Level 1-3'
 territory_tile_highlands2_seen_text: 'Now entering:
 
-  Hospital Area
+  <size=150%>Hospital Area
 
-  <color=#FF9900>Level 13-16</color>'
+  <size=80%><color=#FF9900>Level 13-16</color>'
 territory_tile_highlands3_seen_text: 'Now entering:
 
-  Egyptian Dig
+  <size=150%>Egyptian Dig
 
-  <color=#FF9900>Level 13-16</color>'
+  <size=80%><color=#FF9900>Level 13-16</color>'
 territory_tile_highlands_seen_text: 'Now entering:
 
-  Robot Factory
+  <size=150%>Robot Factory
 
-  <color=#FF9900>Level 13-16</color>'
+  <size=80%><color=#FF9900>Level 13-16</color>'
 territory_tile_highmountains_seen_text: 'Now entering:
 
-  Imperial Palace
+  <size=150%>Imperial Palace
 
-  <color=#FF9900>Level 20</color>'
+  <size=80%><color=#FF9900>Level 20</color>'
 territory_tile_lowlands2_seen_text: 'Now entering:
 
-  Local Guard Post
+  <size=150%>Local Guard Post
 
-  <color=#FF9900>Level 4-8</color>'
+  <size=80%><color=#FF9900>Level 4-8</color>'
 territory_tile_lowlands3_seen_text: 'Now entering:
 
-  Poison Farms
+  <size=150%>Poison Farms
 
-  <color=#FF9900>Level 4-8</color>'
+  <size=80%><color=#FF9900>Level 4-8</color>'
 territory_tile_lowlands_seen_text: 'Now entering:
 
   <size=150%>Mecha Hunting Grounds
 
-  <size=100%><color=#FF9900>Level 4-8</color>'
+  <size=80%><color=#FF9900>Level 4-8</color>'
 territory_tile_midlands2_seen_text: 'Now entering:
 
-  Graveyard
+  <size=150%>Graveyard
 
-  <color=#FF9900>Level 8-12</color>'
+  <size=80%><color=#FF9900>Level 8-12</color>'
 territory_tile_midlands3_seen_text: 'Now entering:
 
-  Fishing Zone
+  <size=150%>Fishing Zone
 
-  <color=#FF9900>Level 8-12</color>'
+  <size=80%><color=#FF9900>Level 8-12</color>'
 territory_tile_midlands_seen_text: 'Now entering:
 
-  Dog Base
+  <size=150%>Dog Base
 
-  <color=#FF9900>Level 8-12</color>'
+  <size=80%><color=#FF9900>Level 8-12</color>'
 territory_tile_mountains_seen_text: 'Now entering:
 
-  Noble Estates
+  <size=150%>Noble Estates
 
-  <color=#FF9900>Level 16-20</color>'
+  <size=80%><color=#FF9900>Level 16-20</color>'
 thiefdungeonsign1: '<font=LSTKClaBol SDF><size=150%>THE VAULTS
 
   <font=Candara SDF><size=100%>The jewels of the empire
 
   under lock and key'
diff --git config_181210_2101/Texts/en-US/maneuvers.txt config_190111_2315/Texts/en-US/maneuvers.txt
index 1940d38..8ee04a0 100644
--- config_181210_2101/Texts/en-US/maneuvers.txt
+++ config_190111_2315/Texts/en-US/maneuvers.txt
@@ -4,10 +4,11 @@ dash: Dash
 dash_back: Hasty Retreat
 himmelman: Flip 180º
 invincibleDash: Invincible Dash
 reverse: Reverse
 shortShield: Clear
+siege: Siege
 slow: Slow
 superspeed: Afterburner
 tank: Absorb
 warpForward: Blink
 warpToAim: Aimed Blink
diff --git config_181210_2101/Texts/en-US/skills.txt config_190111_2315/Texts/en-US/skills.txt
index 9c6e967..2c3b7d8 100644
--- config_181210_2101/Texts/en-US/skills.txt
+++ config_190111_2315/Texts/en-US/skills.txt
@@ -159,11 +159,11 @@ merlin_4a:
 merlin_4b:
   name: Efficiency
 olfaithful_1a:
   name: Fists of Glass
 olfaithful_1b:
-  name: Sight of Glass
+  name: Careful Aim
 olfaithful_2a:
   name: Conservator
 olfaithful_2b:
   name: Safety Glass
 olfaithful_3a:
diff --git config_181210_2101/Texts/en-US/ui.txt config_190111_2315/Texts/en-US/ui.txt
index c015627..599027f 100644
--- config_181210_2101/Texts/en-US/ui.txt
+++ config_190111_2315/Texts/en-US/ui.txt
@@ -206,10 +206,13 @@ friend_info_description_online: 'Flying: {0}
 friend_info_noplane: Nothing
 friend_info_title: '{0}
 
   <size=14>{1}</size>'
 friend_info_unit_format: L{1} {0}
+friend_list_category_friends: Friends ({0})
+friend_list_category_nearby: Nearby Allies ({0})
+friend_list_category_recent: Recent Allies ({0})
 friend_list_empty_label: 'No friends yet.
 
 
   Add friends with "/friend <name>".
 
@@ -223,11 +226,13 @@ friend_list_item_online: <color=#fde8a5ff>on this server</color>
 friend_list_reminder_label: 'Add friends with "/friend <name>".
 
 
   This currently only works for friends on the same server as you.'
 friend_list_title_friends: Friends
-friend_list_title_nearby: Nearby Allies
+friend_micro_more: and {0} more...
+friend_micro_none: 0 friends online.
+friend_micro_open_friend_list: <color=#FBB040>[<action:104>]</color> Open Friend List
 graceful_kick_warning: Account support is underway. You will get disconnected soon. Grab all your loot.
 hangar_armor_generic: Generic
 hangar_elemental_short: <color=#F7663C>ELEM</color>
 hangar_engine_generic: Generic
 hangar_newplane_goalformat: '<color=#E0DF12ff>Next goal: Reach level {0}</color>'
@@ -493,19 +498,26 @@ notify_equipped_auto: <color=#{0}>Auto-Equipped</color>
 notify_full: <color=#{0}>Inventory Full</color>
 notify_full_desc: '<color=#FBB040>[<action:4>]</color> to manage
 
   <color=#FBB040>[<action:33>]</color> to drop trash'
 notify_purchased: <color=#{0}>Purchased</color>
+notify_quick_swap: '
+
+  Press <color=#FBB040>[<action:{0}>]</color> to use'
+notify_quick_swap_undo: '
+
+  Press <color=#FBB040>[<action:{0}>]</color> to swap back'
 notify_tier_short: (T{0})
 notify_ultrarare_short: (UR)
 onscreenindicator_target: TARGET
 options_bind: Rebind
 options_bind_unbound: You have unbound {0} from {1}
 options_menu_Return_Home: Return to Rebel City
 options_menu_SSAO: Ambient Occlusion
 options_menu_autoAdjustQuality: Auto-Optimize Settings
 options_menu_auto_equip: Auto Equip
+options_menu_auto_salute: Auto Salute
 options_menu_bug_report: Report Bug
 options_menu_chat: Chat
 options_menu_colorblind_mode: Colorblind Mode
 options_menu_controls: Controls
 options_menu_credits: Credits
@@ -528,10 +540,11 @@ options_menu_emote_d: Input D emote
 options_menu_emotes: Trigger emote
 options_menu_emotes_sub: Emotes
 options_menu_enable_gamepad: Enable Gamepad
 options_menu_faq: FAQ
 options_menu_force_30_fps: Force 30 FPS
+options_menu_friend_list: Friend List
 options_menu_gamepad_controls: Gamepad Controls
 options_menu_gamepad_controls_UI: Menu Controls
 options_menu_gamepad_controls_abs: Gamepad Absolute
 options_menu_gamepad_controls_abs_UI: Menu controls
 options_menu_gamepad_controls_abs_default: Plane controls
@@ -732,10 +745,22 @@ player_label_admin: ' <color={1}>L{0} A</color>'
 player_label_pilot_level: ' <color={1}>R{0}</color>'
 player_label_pilot_level_chat: ' - R{0}'
 quest_active_heading: '{0} <size=65%>{1}/{2}</size>'
 quest_active_heading_other: '{0}'
 quest_active_inactive: ''
+quest_category_armor: Armor
+quest_category_engine: Engines
+quest_category_format: '{0} <color=#909090>({1})</color>'
+quest_category_laser: Lasers
+quest_category_machinegun: Machine Guns
+quest_category_shotgun: Shotguns
+quest_category_sniper: Snipers
+quest_category_strike: Arcs
+quest_category_sword: Swords
+quest_category_triple: Blasters
+quest_category_unknown: Other
+quest_category_wasp: Wasps
 quest_goal_collect: Collect {0} <color=#FBB040>{1}</color>
 quest_goal_collect_crafting: '{0} <color=#FBB040>{1}</color>'
 quest_goal_collect_dungeon: Collect {0} <color=#FBB040>{1}</color> in <color=#FBB040>{2}</color>
 quest_goal_collect_unit: Collect {0} <color=#FBB040>{1}</color> from <color=#FBB040>{2}</color>
 quest_goal_collect_unit_dungeon: Collect {0} <color=#FBB040>{1}</color> from <color=#FBB040>{2}</color> in <color=#FBB040>{3}</color>
@@ -869,11 +894,13 @@ status_reconnecting: 'Reconnecting
   <size=60%>(attempt: {0})</size>'
 status_server_full: Server Full, Returning to Rebel City
 status_server_timeout: Timed Out, Returning to Rebel City
 status_waiting_tutorial: Waiting for Tutorial
 storage_menu_apply_sort: Apply Sort
+storage_menu_apply_sort_affirm: Yes, Apply Sort
 storage_menu_apply_sort_desc: Sort your storage permanently
+storage_menu_apply_sort_popup: Permanently re-order your storage?
 storage_menu_description_buy: Add more storage spaces.
 storage_menu_description_plane: '{0} of {1} items'
 storage_menu_description_storage: '{0} of {1} items'
 storage_menu_equip_item: Equip Item
 storage_menu_filter: 'Filter :'
diff --git config_181210_2101/Texts/en-US/units.txt config_190111_2315/Texts/en-US/units.txt
index fac2874..5cc6f44 100644
--- config_181210_2101/Texts/en-US/units.txt
+++ config_190111_2315/Texts/en-US/units.txt
@@ -213,10 +213,11 @@ blink: Blink
 blinkleader: Blink Command
 blizzard: Blizzard
 blizzard2: Blizzard
 blizzardcore: Blizzard Generator
 blizzardiciclesmaster: Ice Node
+blizzardiciclesmaster_noxp: Ice Node
 blocker: Sentinel-1
 blocker2: Sentinel-2
 blocker2slider: Sentinel-2
 blocker3: Sentinel-3
 blocker4: Doom Sentinel-1
@@ -329,11 +330,13 @@ cyclopus2: Psychopus
 cyclopuslaser: Psychopus Eye
 doc: Blood Nurse
 dochatcher: Blood Nurse
 docmini: Nurse
 dragonbaby: Guard Beast
+dragonbabyfireball: Guard Beast
 dragonmama: Guard Lion
+dragonmamafireball: Guard Lion
 dragonsnake01: Poison God
 dragonsnake02: Poison God Engine
 dragonsnake03: Poison God
 dragonsnakeDEATH: Poison God
 dragonsnakeegg: Giant Egg
@@ -445,10 +448,11 @@ flamebat: Mad prisoner
 flamebatleader: Converted Prisoner
 flamer: Fire Hunter
 flamingskull: Headmaster
 foxtrot: Fire Retriever
 frostgiant: Frost Giant
+frostgiant_noxp: Frost Giant
 gargantua: Gargantua
 gargantuaDEATH: Gargantua
 gargantuafistleft: Gargantua Left Fist
 gargantuafistright: Gargantua Right Fist
 gargantualaser: Gargantua Laser
diff --git config_181210_2101/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt config_190111_2315/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt
index 9dfb771..6326418 100644
--- config_181210_2101/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt	
+++ config_190111_2315/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_arena2entrance/SP_5XHMT_arena2entrance_mazerunnerbomb.txt	
@@ -32,5 +32,6 @@ maxTurnRate: '100'
 minSpeed: '0'
 recoilScale: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: SP_5XHMT_arena2entrance_mazerunnerbomb
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt config_190111_2315/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt
index 7c07ab8..4ea7e25 100644
--- config_181210_2101/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt	
+++ config_190111_2315/Units/00 - Quest Enemies/Setpiece Quests/SP_5XHMT_iceentrance/SP_5XHMT_iceentrance_blizzardcore.txt	
@@ -7,11 +7,11 @@ energyRegenRate: '0'
 explosionPrefab: ExplosionBig_NoDebris
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0.0'
-  gunTemplateName: SpotterTripleShotGun
+  gunTemplateName: blizzardcoreTripleShotGun
   mountAngle: '0'
   mountName: blizzardcoreTripleShotMount
   signalTime: '2'
   slewRate: '360'
 healthRegenRate: '0'
@@ -22,6 +22,6 @@ maxSpeed: '0'
 maxTurnRate: '90'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: SP_5XHMT_iceentrance_blizzardcore
 tier: '10'
-xpMultiplier: '0'
+xpMultiplier: '0.25'
diff --git config_181210_2101/Units/01 - Beach/BOS1_fivestar.txt config_190111_2315/Units/01 - Beach/BOS1_fivestar.txt
index 1747a9e..91b156e 100644
--- config_181210_2101/Units/01 - Beach/BOS1_fivestar.txt	
+++ config_190111_2315/Units/01 - Beach/BOS1_fivestar.txt	
@@ -16,11 +16,11 @@ gunMounts:
 gunTypes:
 - bulletPrefab: bigBullet
   burst: '1'
   cooldown: '0.0'
   damage: '1.0'
-  lifetime: '1.0'
+  lifetime: '2.5'
   name: fivestarGun
   rof: '1.5'
   speed: '3.0'
   spread: '0'
 healthRegenRate: '0'
diff --git config_181210_2101/Units/01 - Beach/BOS2_trainA02.txt config_190111_2315/Units/01 - Beach/BOS2_trainA02.txt
index 2745d1e..6304cda 100644
--- config_181210_2101/Units/01 - Beach/BOS2_trainA02.txt	
+++ config_190111_2315/Units/01 - Beach/BOS2_trainA02.txt	
@@ -6,11 +6,11 @@ colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
-maxHitPoints: '10'
+maxHitPoints: '15'
 maxSpeed: '2'
 maxTurnRate: '90'
 minSpeed: '0.3'
 noScribing: 'true'
 templateName: trainA02
diff --git config_181210_2101/Units/01 - Beach/GRP2_starfighter.txt config_190111_2315/Units/01 - Beach/GRP2_starfighter.txt
index 5a1a7e1..ea04239 100644
--- config_181210_2101/Units/01 - Beach/GRP2_starfighter.txt	
+++ config_190111_2315/Units/01 - Beach/GRP2_starfighter.txt	
@@ -1,7 +1,7 @@
 art: EnemyStarfighter
-artScale: '1'
+artScale: '1.33'
 colliderRadius: '0.25'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
@@ -28,10 +28,10 @@ maxEnergyPoints: '1'
 maxHitPoints: '15'
 maxSpeed: '10'
 maxTurnRate: '270'
 minSpeed: '0'
 noScribing: 'true'
-spawnInvulnerabilitySeconds: '2'
+spawnInvulnerabilitySeconds: '10000'
 templateName: starfighter
 tier: '0'
 trailLength: '0'
 xpMultiplier: '0'
diff --git config_181210_2101/Units/01 - Beach/GRP3_tieleader2.txt config_190111_2315/Units/01 - Beach/GRP3_tieleader2.txt
index b94f5a7..4b60a91 100644
--- config_181210_2101/Units/01 - Beach/GRP3_tieleader2.txt	
+++ config_190111_2315/Units/01 - Beach/GRP3_tieleader2.txt	
@@ -1,28 +1,57 @@
 art: EnemyTieleader
-artScale: '1.0'
+artScale: '1.2'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
-  firingArc: '40'
+  firingArc: '90'
   flashOffset: '0.33'
-  gunTemplateName: tieGun
+  gunTemplateName: tieGun2
   mountAngle: '0'
   mountName: forwardgun
+  sfx:
+    pitch: '1.2'
+    sound: Enemy Shotgun Mild
+    volume: '0.8'
   slewRate: '15'
 gunTypes:
 - burst: '1'
-  cooldown: '1.5'
+  cooldown: '5'
   damage: '1'
-  lifetime: '3'
+  lifetime: '8'
+  multi: '2'
+  multiSpread: '45'
   name: tieGun
-  rof: '1.5'
-  speed: '2.4'
-  spread: '15'
+  range: '16'
+  rof: '2.5'
+  speed: '2'
+  spread: '0'
+- burst: '1'
+  cooldown: '5'
+  damage: '1.5'
+  lifetime: '8'
+  multi: '2'
+  multiSpread: '45'
+  name: tieGun_2
+  range: '16'
+  rof: '2.5'
+  speed: '2'
+  spread: '0'
+- burst: '1'
+  cooldown: '5'
+  damage: '2.1'
+  lifetime: '8'
+  multi: '3'
+  multiSpread: '30'
+  name: tieGun2
+  range: '16'
+  rof: '2.5'
+  speed: '2'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '10'
 maxSpeed: '1.8'
 maxTurnRate: '35'
diff --git config_181210_2101/Units/01 - Beach/GRP3_tiewingman.txt config_190111_2315/Units/01 - Beach/GRP3_tiewingman.txt
index f11310e..2a9f81e 100644
--- config_181210_2101/Units/01 - Beach/GRP3_tiewingman.txt	
+++ config_190111_2315/Units/01 - Beach/GRP3_tiewingman.txt	
@@ -1,23 +1,27 @@
 art: EnemyTiewingman
-artScale: '1.0'
+artScale: '0.75'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: Aimed
-  firingArc: '40'
+  firingArc: '180'
   flashOffset: '0.33'
   gunTemplateName: tieGun
   mountAngle: '0'
   mountName: forwardgun
+  sfx:
+    pitch: '1.5'
+    sound: Enemy Shotgun Mild
+    volume: '0.8'
   slewRate: '15'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '6'
+maxHitPoints: '3.5'
 maxSpeed: '1.9'
 maxTurnRate: '105'
 minSpeed: '0.4'
 particlePositions:
 - name: darkSmoke
diff --git config_190111_2315/Units/01 - Beach/GRP3_tiewingman_big.txt config_190111_2315/Units/01 - Beach/GRP3_tiewingman_big.txt
new file mode 100644
index 0000000..a5c96f8
--- /dev/null
+++ config_190111_2315/Units/01 - Beach/GRP3_tiewingman_big.txt	
@@ -0,0 +1,38 @@
+art: EnemyTiewingman
+artScale: '1'
+colliderRadius: '0.4'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionSmall
+gunMounts:
+- fireMode: Aimed
+  firingArc: '180'
+  flashOffset: '0.33'
+  gunTemplateName: tieGun_2
+  mountAngle: '0'
+  mountName: forwardgun
+  sfx:
+    pitch: '1.5'
+    sound: Enemy Shotgun Mild
+    volume: '0.8'
+  slewRate: '15'
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '6'
+maxSpeed: '1.9'
+maxTurnRate: '105'
+minSpeed: '0.4'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '0'
+  - '-0.52'
+  - '-0.15'
+  rot:
+  - '0'
+  - '0'
+  - '0'
+spawnInvulnerabilitySeconds: '2'
+templateName: tiewingman_big
+tier: '0'
diff --git config_181210_2101/Units/01 - Beach/SLO2_spotter.txt config_190111_2315/Units/01 - Beach/SLO2_spotter.txt
index a6a3e7d..dee9d56 100644
--- config_181210_2101/Units/01 - Beach/SLO2_spotter.txt	
+++ config_190111_2315/Units/01 - Beach/SLO2_spotter.txt	
@@ -4,29 +4,28 @@ colliderRadius: '0.7'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
-  firingArc: '360'
+  firingArc: '180'
   flashOffset: '0.0'
-  gunTemplateName: SpotterTripleShotGun
+  gunTemplateName: SpotterSniperGun
   mountAngle: '0'
   mountName: SpotterTripleShotMount
   signalTime: '2'
-  slewRate: '360'
+  slewRate: '45'
 gunTypes:
-- burst: '1'
-  cooldown: '5'
-  damage: '2.1'
-  lifetime: '8'
-  multi: '3'
-  multiSpread: '30'
-  name: SpotterTripleShotGun
-  range: '16'
-  rof: '2.5'
-  speed: '2'
-  spread: '0'
+- bulletPrefab: shurikenBullet
+  burst: '3'
+  cooldown: '1.5'
+  damage: '0.8'
+  lifetime: '1.5'
+  multi: '1'
+  name: SpotterSniperGun
+  rof: '6'
+  speed: '8'
+  spread: '15'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '15'
 maxSpeed: '0.3'
 maxTurnRate: '10'
diff --git config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_fighter.txt config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_fighter.txt
index b2f3a1c..c62cdb7 100644
--- config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_fighter.txt	
+++ config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_fighter.txt	
@@ -11,20 +11,19 @@ gunMounts:
   gunTemplateName: fighterGun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
-- burst: '1'
+- burst: '6'
   cooldown: '5'
-  damage: '0.56'
-  lifetime: '8'
-  multi: '3'
-  multiSpread: '15'
+  damage: '1.3'
+  lifetime: '3'
+  multi: '1'
   name: fighterGun
-  rof: '1.0'
-  speed: '2.5'
-  spread: '0'
+  rof: '3'
+  speed: '5'
+  spread: '20'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '7.5'
 maxSpeed: '2.2'
 maxTurnRate: '60'
diff --git config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_flamer.txt config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_flamer.txt
index b165af4..269f99a 100644
--- config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_flamer.txt	
+++ config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_flamer.txt	
@@ -1,7 +1,7 @@
 art: EnemyFlamer
-artScale: '1'
+artScale: '1.2'
 colliderRadius: '0.65'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - waterWeakness
@@ -30,25 +30,26 @@ gunTypes:
   effectAmount: '0.5'
   effectTime: '5.0'
   lifetime: '0.8'
   multi: '2'
   multiOffset:
-  - '1.6'
+  - '0.8'
+  - '0.8'
   name: FlamerFlamethrower
   rof: '10'
   speed: '3'
   spread: '15'
 healthRegenRate: '0'
 lootGlobal:
   main:
     lootTable:
     - weight: '88'
     - items:
       - id: dungeon_bomb
       weight: '12'
 maxEnergyPoints: '1'
-maxHitPoints: '25'
+maxHitPoints: '30'
 maxSpeed: '1.8'
 maxTurnRate: '55'
 minSpeed: '0.8'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_foxtrot.txt config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_foxtrot.txt
index 27b417d..5e6c671 100644
--- config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_foxtrot.txt	
+++ config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_foxtrot.txt	
@@ -11,18 +11,20 @@ gunMounts:
   gunTemplateName: foxtrotGun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
-- burst: '6'
+- burst: '1'
   cooldown: '5'
-  damage: '1.3'
-  lifetime: '3'
+  damage: '0.56'
+  lifetime: '8'
+  multi: '3'
+  multiSpread: '15'
   name: foxtrotGun
-  rof: '3'
-  speed: '3.5'
-  spread: '20'
+  rof: '1.0'
+  speed: '2.5'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '7.5'
 maxSpeed: '2.5'
 maxTurnRate: '90'
diff --git config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP1_sparrow.txt config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP1_sparrow.txt
index ed777ad..091a685 100644
--- config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP1_sparrow.txt	
+++ config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP1_sparrow.txt	
@@ -26,11 +26,11 @@ gunTypes:
   speed: '6'
   spread: '15'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '2.5'
-maxSpeed: '4'
+maxSpeed: '6'
 maxTurnRate: '120'
 minSpeed: '3'
 particlePositions:
 - name: darkSmoke
   pos:
diff --git config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP2_grid.txt config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP2_grid.txt
index 05bd5d0..cc9daae 100644
--- config_181210_2101/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP2_grid.txt	
+++ config_190111_2315/Units/11 - Lowlands (City) - WWI_SteamPunk/GRP2_grid.txt	
@@ -14,19 +14,19 @@ gunMounts:
   mountName: main
   sfx:
     sound: Enemy Laser Loop3
   slewRate: '0'
 gunTypes:
-- burst: '20'
-  cooldown: '2'
+- burst: '40'
+  cooldown: '1'
   damage: '0.35'
   lifetime: '0.75'
   multi: '4'
   multiSpread: '90'
   name: gridLaser
   rof: '10'
-  speed: '10'
+  speed: '5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '4.5'
 maxSpeed: '0.0'
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_pod.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_pod.txt
index 46c8b49..d7ba00e 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_pod.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_pod.txt	
@@ -41,8 +41,8 @@ particlePositions:
   - '-0.3'
   rot:
   - '-90'
   - '0'
   - '0'
-spawnInvulnerabilitySeconds: '2'
+spawnInvulnerabilitySeconds: '0'
 templateName: pod
 tier: '2'
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_podleader.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_podleader.txt
index 4f32238..41baaf8 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_podleader.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS1_podleader.txt	
@@ -9,40 +9,63 @@ energyRegenRate: '0'
 gunMounts:
 - fireMode: Sprinkler
   firingArc: '360'
   flashOffset: '1.5'
   gunTemplateName: podleaderMainGun
-  mountAngle: '240'
+  mountAngle: '0'
   mountName: main6
+  sfx:
+    pitch: '1.5'
+    sound: Enemy Machinegun Medium
+    volume: '0.8'
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '-93'
-  sprinklerStartAngle: '240'
+  sprinklerIncrementAngle: '0'
+  sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '-8240'
+- fireMode: Aimed
+  firingArc: '90'
+  flashOffset: '1.5'
+  gunTemplateName: podleaderRifle
+  mountAngle: '0'
+  mountName: main7
+  slewRate: '45'
 gunTypes:
 - burst: '4'
   cooldown: '0'
   damage: '0.3'
   lifetime: '2'
   name: podleadergun
   range: '50'
   rof: '3'
   speed: '3'
   spread: '0'
 - burst: '100'
   cooldown: '0'
   damage: '0.3'
-  lifetime: '1'
+  lifetime: '2'
+  multi: '4'
+  multiSpread: '90'
   name: podleaderMainGun
   rof: '20'
   speed: '3'
   spread: '0'
+- burst: '100'
+  cooldown: '0'
+  damage: '1'
+  lifetime: '2'
+  multi: '1'
+  multiSpread: '0'
+  name: podleaderRifle
+  rof: '3'
+  speed: '3'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '70'
 maxSpeed: '1'
-maxTurnRate: '20'
+maxTurnRate: '90'
 minSpeed: '1'
 particlePositions:
 - name: darkSmoke
   pos:
   - '0.13'
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridboss.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridboss.txt
index 3bf9471..c878508 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridboss.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridboss.txt	
@@ -3,10 +3,11 @@ artScale: '1.5'
 bankSmoothing: '10000'
 colliderRadius: '.8'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
+explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: Sprinkler
   firingArc: '360'
   flashOffset: '1.5'
   gunTemplateName: gridbossGun
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridbosssaucer.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridbosssaucer.txt
index bbcd3ae..52ac3ae 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridbosssaucer.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/BOS2_gridbosssaucer.txt	
@@ -25,21 +25,25 @@ gunMounts:
   slewRate: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '10'
 maxSpeed: '0'
-maxTurnRate: '20'
+maxTurnRate: '40'
 minSpeed: '0'
 particlePositions:
 - name: darkSmoke
   pos:
   - '0'
   - '-0.38'
   - '-0.5'
   rot:
   - '-90'
   - '0'
   - '0'
+spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
+spawnPFXPrefab: EnemyLaunchPod
+spawnPFXRotateRandomly: 'true'
 templateName: gridbosssaucer
 tier: '2'
+useSpawnDuration: 'true'
 xpMultiplier: '0'
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasership.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasership.txt
index 6eef217..69301ef 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasership.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasership.txt	
@@ -3,30 +3,50 @@ artScale: '1.0'
 colliderRadius: '0.7'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '50'
   flashOffset: '0.4'
   gunTemplateName: LasershipLaser
   mountAngle: '0'
   mountName: main
   sfx:
     sound: Enemy Laser Loop5
   slewRate: '10'
+- fireMode: JustShootDammit
+  firingArc: '50'
+  flashOffset: '0.4'
+  gunTemplateName: LasershipChargingLaser
+  mountAngle: '0'
+  mountName: lockon
+  sfx:
+    pitch: '2'
+    sound: Enemy Laser Charging Mild
+  slewRate: '10'
 gunTypes:
 - burst: '13'
   cooldown: '10'
   damage: '0.175'
   lifetime: '0.75'
   multi: '1'
   multiSpread: '0'
   name: LasershipLaser
   rof: '20'
   speed: '10'
   spread: '0'
+- burst: '10'
+  cooldown: '0'
+  damage: '0.175'
+  lifetime: '0.75'
+  multi: '1'
+  multiSpread: '0'
+  name: LasershipChargingLaser
+  rof: '3'
+  speed: '0'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '6'
 maxSpeed: '1.5'
 maxTurnRate: '55'
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasershipleader.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasershipleader.txt
index 28d1b17..e6fd488 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasershipleader.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/GRP1_lasershipleader.txt	
@@ -4,30 +4,62 @@ colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
-  firingArc: '50'
+  firingArc: '360'
   flashOffset: '0.4'
   gunTemplateName: lasershipleaderLaser
-  mountAngle: '45'
+  mountAngle: '180'
   mountName: main
   sfx:
     sound: Enemy Laser Loop3
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '100'
+  flashOffset: '0.4'
+  gunTemplateName: LasershipLaser
+  mountAngle: '0'
+  mountName: main2
+  sfx:
+    pitch: '0.8'
+    sound: Enemy Laser Loop4
+  slewRate: '20'
+- fireMode: JustShootDammit
+  firingArc: '50'
+  flashOffset: '0.4'
+  gunTemplateName: LasershipChargingLaser
+  mountAngle: '0'
+  mountName: lockon
+  sfx:
+    pitch: '1.5'
+    sound: Enemy Laser Charging Mild
   slewRate: '10'
 gunTypes:
 - burst: '40'
   cooldown: '3'
   damage: '0.42'
   lifetime: '2'
-  multi: '4'
+  multi: '3'
   multiSpread: '90'
   name: lasershipleaderLaser
   range: '50'
   rof: '10'
   speed: '5'
   spread: '0'
+- burst: '40'
+  cooldown: '3'
+  damage: '0.42'
+  hashOverride: '108'
+  lifetime: '2'
+  multi: '2'
+  multiSpread: '10'
+  name: lasershipleaderLaser2
+  range: '50'
+  rof: '10'
+  speed: '5'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '22.5'
 maxSpeed: '1.5'
 maxTurnRate: '55'
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO2_unicorn.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO2_unicorn.txt
index 93eb375..bb6ed64 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO2_unicorn.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO2_unicorn.txt	
@@ -1,7 +1,7 @@
 art: EnemyUnicorn
-artScale: '1'
+artScale: '1.6'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - waterWeakness
@@ -94,11 +94,11 @@ gunTypes:
   rof: '4'
   speed: '8'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '20'
+maxHitPoints: '45'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO3_ninjaAgrenade.txt config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO3_ninjaAgrenade.txt
index 0722abe..f4f819a 100644
--- config_181210_2101/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO3_ninjaAgrenade.txt	
+++ config_190111_2315/Units/12 - Lowlands (Ruins) - Fantasy(Common)/SLO3_ninjaAgrenade.txt	
@@ -4,29 +4,29 @@ colliderRadius: '0.5'
 energyRegenRate: '0'
 explosionPrefab: Explosion_Hazard_Mild
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '1'
+  flashOffset: '0'
   gunTemplateName: ninjaAgrenadegun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
 - bulletHue: red
   bulletPalette: glow
   bulletPrefab: leisurelyBullet
-  bulletSize: '2'
+  bulletSize: '4.5'
   burst: '1'
   cooldown: '1'
-  damage: '1.4'
-  lifetime: '0.5'
-  multi: '2'
+  damage: '1'
+  lifetime: '1.25'
+  multi: '1'
   multiSpread: '180'
   name: ninjaAgrenadegun
   rof: '100'
-  speed: '2'
+  speed: '3'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS1_beehex.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS1_beehex.txt
index c6ba43c..3e5c5d3 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS1_beehex.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS1_beehex.txt	
@@ -60,8 +60,12 @@ particlePositions:
   - '0.03'
   rot:
   - '0'
   - '0'
   - '0'
+spawnDuration: '3'
 spawnInvulnerabilitySeconds: '2'
+spawnPFXPrefab: EnemyLaunchPod
+spawnPFXRotateRandomly: 'true'
 templateName: beehex
 tier: '2'
+useSpawnDuration: 'true'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede01.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede01.txt
index 2915c94..fd539a1 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede01.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede01.txt	
@@ -6,66 +6,66 @@ colliderY: '0'
 elementSusceptibilityIds:
 - burnWeakness
 - poisonResist
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Hose
-  firingArc: '60'
+- fireMode: Aimed
+  firingArc: '45'
   flashOffset: '0.5'
   gunTemplateName: centipedeHeadHasChildrenGun
   mountAngle: '0'
   mountName: haschildrengun
-  slewRate: '60'
+  offset:
+  - '0'
+  - '2'
+  slewRate: '0'
 - fireMode: Aimed
-  firingArc: '180'
+  firingArc: '45'
   flashOffset: '0.5'
   gunTemplateName: centipedeHeadNoChildrenGun
   mountAngle: '0'
   mountName: nochildrengun
-  slewRate: '180'
-- fireMode: SprinklerTurnback
+  offset:
+  - '0'
+  - '2'
+  slewRate: '0'
+- fireMode: Aimed
   firingArc: '10'
   flashOffset: '0.1'
   gunTemplateName: centipedeNonHeadHasChildrenGun
   mountAngle: '0'
   mountName: haschildrengun2
   slewRate: '0'
-  sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '5'
-  sprinklerStartAngle: '-5'
-  sprinklerTurnbackAngle: '5'
-  syncOffset: '0.1'
-  syncTo: haschildrengun
 gunTypes:
 - burst: '3'
   cooldown: '3'
   damage: '0.35'
   effect: Poison
   effectAmount: '0.1'
   effectDamage: '0.35'
   effectTime: '0.1'
   lifetime: '2'
-  multi: '3'
+  multi: '6'
   multiSpread: '10'
   name: centipedeHeadHasChildrenGun
   rof: '1'
   speed: '3.5'
-  spread: '3'
+  spread: '4.5'
 - burst: '9'
   cooldown: '3'
   damage: '0.5'
   effect: Poison
   effectAmount: '0.1'
   effectDamage: '0.5'
   effectTime: '0.1'
   lifetime: '2'
-  multi: '3'
+  multi: '9'
   multiSpread: '10'
   name: centipedeHeadNoChildrenGun
   rof: '3'
   speed: '3.5'
-  spread: '3'
+  spread: '4.5'
 - burst: '1'
   cooldown: '2'
   damage: '0'
   lifetime: '0'
   name: centipedeNonHeadTimerGunDud
@@ -104,11 +104,11 @@ lootGlobal:
     - items:
       - id: dungeon_bomb
       weight: '12'
 maxEnergyPoints: '1'
 maxHitPoints: '50'
-maxSpeed: '2'
+maxSpeed: '4'
 maxTurnRate: '90'
-minSpeed: '2'
+minSpeed: '4'
 templateName: centipede01
 tier: '2'
 xpMultiplier: '1.3'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede02.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede02.txt
index 98c1521..044c2d8 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede02.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede02.txt	
@@ -47,10 +47,10 @@ gunMounts:
   slewRate: '360'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '12.5'
-maxSpeed: '2.0'
+maxSpeed: '4'
 maxTurnRate: '90'
 minSpeed: '0.3'
 templateName: centipede02
 tier: '2'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede03.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede03.txt
index fbe79c7..18d565e 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede03.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/BOS2_centipede03.txt	
@@ -45,10 +45,10 @@ gunMounts:
   slewRate: '360'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '12.5'
-maxSpeed: '2.0'
+maxSpeed: '4'
 maxTurnRate: '90'
 minSpeed: '0.3'
 templateName: centipede03
 tier: '2'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navi.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navi.txt
index 106b18e..851090d 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navi.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navi.txt	
@@ -11,10 +11,17 @@ gunMounts:
   flashOffset: '0.4'
   gunTemplateName: naviGunSlow
   mountAngle: '0'
   mountName: main1
   slewRate: '90'
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0'
+  gunTemplateName: navigrenadegun
+  mountAngle: '0'
+  mountName: main
+  slewRate: '0'
 gunTypes:
 - burst: '12'
   cooldown: '5'
   damage: '0.2'
   effect: Poison
@@ -26,10 +33,24 @@ gunTypes:
   multiSpread: '90'
   name: naviGunSlow
   rof: '1.5'
   speed: '1'
   spread: '0'
+- bulletHue: red
+  bulletPalette: glow
+  bulletPrefab: leisurelyBullet
+  bulletSize: '1'
+  burst: '1'
+  cooldown: '1'
+  damage: '1'
+  lifetime: '1.25'
+  multi: '8'
+  multiSpread: '45'
+  name: navigrenadegun
+  rof: '100'
+  speed: '2'
+  spread: '0'
 hashOverride: '101'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navileader.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navileader.txt
index e356319..9fc6bb2 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navileader.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/GRP2_navileader.txt	
@@ -4,16 +4,39 @@ colliderHeight: '2.85'
 colliderWidth: '3'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig2
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0.4'
+  gunTemplateName: naviLeaderGunSlow
+  mountAngle: '0'
+  mountName: main1
+  slewRate: '90'
+gunTypes:
+- burst: '24'
+  cooldown: '5'
+  damage: '0.2'
+  effect: Poison
+  effectAmount: '0.1'
+  effectDamage: '0.2'
+  effectTime: '0.1'
+  lifetime: '4'
+  multi: '8'
+  multiSpread: '45'
+  name: naviLeaderGunSlow
+  rof: '1.5'
+  speed: '1'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '45'
 maxSpeed: '0.2'
 maxTurnRate: '35'
 minSpeed: '0.1'
-spawnInvulnerabilitySeconds: '2'
+spawnInvulnerabilitySeconds: '0'
 templateName: navileader
 tier: '2'
 trailLength: '3'
 xpMultiplier: '1.3'
diff --git config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowisp.txt config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowisp.txt
index b8e705e..162349b 100644
--- config_181210_2101/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowisp.txt	
+++ config_190111_2315/Units/13 - Lowlands (Rural) - Forest_Insect/SLO1_willowisp.txt	
@@ -17,23 +17,26 @@ gunMounts:
   sprinklerFlyback: 'true'
   sprinklerIncrementAngle: '65'
   sprinklerStartAngle: '-5'
   sprinklerTurnbackAngle: '1000000'
 gunTypes:
-- bulletPrefab: leisurelyBullet
+- bulletHue: red
+  bulletPalette: ringing
+  bulletPrefab: leisurelyBullet
+  bulletSize: '1'
   burst: '5000000'
   cooldown: '4'
-  damage: '0.4'
+  damage: '0.3'
   effect: Poison
   effectAmount: '0.1'
-  effectDamage: '0.4'
+  effectDamage: '0.3'
   effectTime: '0.1'
-  lifetime: '1.5'
+  lifetime: '4.25'
   name: willowispGun
   range: '2'
   rof: '10'
-  speed: '1'
+  speed: '3'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '15'
 maxSpeed: '0.25'
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopper.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopper.txt
index 0a63d42..60da7d3 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopper.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopper.txt	
@@ -9,25 +9,55 @@ gunMounts:
 - fireMode: Aimed
   firingArc: '180'
   flashOffset: '0.4'
   gunTemplateName: HopperLaser
   mountAngle: '0'
-  mountName: main
+  mountname: warning
   sfx:
-    sound: Enemy Laser Loop6
+    pitch: '1'
+    sound: Enemy Machinegun Hot
+    volume: '0.7'
+  slewRate: '0'
+  syncOffset: '0.5'
+  syncTo: warning
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '1'
+  gunTypeConfig:
+    bulletHue: red
+    bulletPalette: halo
+    bulletPrefab: shurikenBullet
+    bulletSize: '3'
+    burst: '1'
+    cooldown: '100000'
+    damage: '0.5'
+    lifetime: '0.25'
+    multi: '1'
+    multiSpread: '0'
+    name: hammer
+    rof: '1'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: warning
+  sfx:
+    pitch: '4'
+    sound: Enemy spawn rocketpod
+    volume: '0.5'
   slewRate: '0'
 gunTypes:
-- burst: '15'
+- bulletPrefab: spinnerBullet
+  burst: '15'
   cooldown: '1'
-  damage: '0.55'
-  lifetime: '0.75'
+  damage: '0.45'
+  lifetime: '1.5'
   multi: '1'
   multiSpread: '0'
   name: HopperLaser
   range: '50'
   rof: '10'
-  speed: '10'
+  speed: '7.5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '5'
 maxSpeed: '1.5'
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopperleader.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopperleader.txt
index c68383f..02019ea 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopperleader.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP1_hopperleader.txt	
@@ -10,25 +10,48 @@ gunMounts:
   flashOffset: '0.4'
   gunTemplateName: hopperleaderLaser
   mountAngle: '0'
   mountName: main
   slewRate: '0'
+- fireMode: Aimed
+  firingArc: '180'
+  flashOffset: '0.4'
+  gunTemplateName: hopperleaderLaser2
+  mountAngle: '0'
+  mountName: main2
+  sfx:
+    pitch: '0.7'
+    sound: Enemy Machinegun Hot
+    volume: '0.9'
+  slewRate: '0'
 gunTypes:
 - burst: '4'
-  cooldown: '1'
-  damage: '1.8'
-  lifetime: '3'
+  cooldown: '4'
+  damage: '1'
+  lifetime: '5'
   multi: '4'
   multiSpread: '90'
   name: hopperleaderLaser
   range: '50'
   rof: '1'
-  speed: '5'
+  speed: '3'
+  spread: '0'
+- bulletPrefab: spinnerBullet
+  burst: '12'
+  cooldown: '1'
+  damage: '1'
+  lifetime: '1.5'
+  multi: '1'
+  multiSpread: '0'
+  name: hopperleaderLaser2
+  range: '50'
+  rof: '3'
+  speed: '7.5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '6'
+maxHitPoints: '15'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardog.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardog.txt
index f0f9dc0..a4a188d 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardog.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardog.txt	
@@ -11,21 +11,22 @@ gunMounts:
   gunTemplateName: stardogGun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
-- burst: '5'
+- bulletPrefab: shurikenBullet
+  burst: '3'
   cooldown: '5'
-  damage: '1.5'
+  damage: '0.6'
   lifetime: '3'
   name: stardogGun
   rof: '3'
   speed: '6.5'
   spread: '10'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '38'
+maxHitPoints: '10'
 maxSpeed: '3.5'
 maxTurnRate: '40'
 minSpeed: '1.5'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardogleader.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardogleader.txt
index bc1d52d..b2abdb9 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardogleader.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/GRP4_stardogleader.txt	
@@ -11,21 +11,29 @@ gunMounts:
   gunTemplateName: stardogleaderGun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
-- burst: '5'
-  cooldown: '5'
+- bulletPrefab: shurikenBullet
+  burst: '5'
+  cooldown: '3'
   damage: '1.6'
   lifetime: '3'
   multi: '5'
   multiSpread: '45'
   name: stardogleaderGun
   rof: '3'
   speed: '8'
   spread: '10'
 healthRegenRate: '0'
+loot:
+  loot1:
+    lootTableId: tiernleader
+  loot2:
+    lootTable:
+    - weight: '200'
+    lootTableId: tiernleader
 maxEnergyPoints: '1'
 maxHitPoints: '50'
 maxSpeed: '3.5'
 maxTurnRate: '40'
 minSpeed: '1.5'
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO1_drone.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO1_drone.txt
index b5e0fef..ecd68cf 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO1_drone.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO1_drone.txt	
@@ -1,48 +1,54 @@
 art: EnemyDrone
-artScale: '1.0'
+artScale: '2'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
-explosionPrefab: ExplosionSmall
+explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: Aimed
-  firingArc: '180'
+  firingArc: '90'
   flashOffset: '0.4'
   gunTemplateName: droneGun
-  mountAngle: '90'
+  mountAngle: '0'
   mountName: main
-  slewRate: '10'
+  sfx:
+    pitch: '0.5'
+    sound: Enemy Sniper Mild
+  slewRate: '30'
 - fireMode: Aimed
-  firingArc: '180'
-  flashOffset: '0.4'
-  gunTemplateName: droneGun
-  mountAngle: '270'
-  mountName: main
-  slewRate: '10'
-- fireMode: Aimed
-  firingArc: '180'
-  flashOffset: '0.4'
-  gunTemplateName: droneGun
+  firingArc: '120'
+  flashOffset: '0.8'
+  gunTemplateName: droneGun2
   mountAngle: '180'
-  mountName: main
+  mountName: main2
   slewRate: '10'
 gunTypes:
-- burst: '2'
+- burst: '90'
   cooldown: '6'
   damage: '2.0'
-  lifetime: '8'
+  lifetime: '1.5'
   name: droneGun
   rof: '1.5'
-  speed: '2.5'
+  speed: '7'
+  spread: '0'
+- burst: '8'
+  cooldown: '6'
+  damage: '0.8'
+  lifetime: '8'
+  multi: '5'
+  multiSpread: '30'
+  name: droneGun2
+  rof: '1.5'
+  speed: '2'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '11'
+maxHitPoints: '25'
 maxSpeed: '3'
-maxTurnRate: '60'
+maxTurnRate: '90'
 minSpeed: '0.1'
 particlePositions:
 - name: darkSmoke
   pos:
   - '-0.23'
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayer.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayer.txt
index da46ccf..a45b1f1 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayer.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayer.txt	
@@ -6,10 +6,10 @@ colliderY: '0'
 energyRegenRate: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '12.5'
 maxSpeed: '1.5'
-maxTurnRate: '55'
+maxTurnRate: '45'
 minSpeed: '0.8'
 spawnInvulnerabilitySeconds: '2'
 templateName: minelayer
 tier: '3'
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayergrenade.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayergrenade.txt
index fadfa84..ed0e8e0 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayergrenade.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO2_minelayergrenade.txt	
@@ -1,7 +1,8 @@
 art: EnemyRoboMine
 artScale: '1.25'
+bankSmoothing: '10000'
 colliderRadius: '0.6'
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed_Hazard_Medium
 gunMounts:
 - fireMode: JustShootDammit
@@ -27,11 +28,12 @@ gunTypes:
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '8'
 maxSpeed: '0'
-maxTurnRate: '0'
+maxTurnRate: '720'
 minSpeed: '0'
+recoilScale: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: minelayergrenade
 tier: '3'
 xpMultiplier: '0'
diff --git config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO3_steamjet.txt config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO3_steamjet.txt
index 311eb13..b4286f8 100644
--- config_181210_2101/Units/21 - Midlands (City) - WWII_ModernTech/SLO3_steamjet.txt	
+++ config_190111_2315/Units/21 - Midlands (City) - WWII_ModernTech/SLO3_steamjet.txt	
@@ -4,26 +4,27 @@ colliderRadius: '1.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
-  firingArc: '60'
+  firingArc: '90'
   flashOffset: '0.4'
   gunTemplateName: steamjetlaser
   mountAngle: '0'
   mountName: main
   sfx:
     sound: Enemy Machinegun Medium
-  slewRate: '30'
+  slewRate: '90'
 gunTypes:
-- burst: '10'
+- bulletPrefab: spinnerBullet
+  burst: '10'
   cooldown: '0'
   damage: '0.4'
-  lifetime: '2'
+  lifetime: '1.5'
   name: steamjetlaser
   rof: '10'
-  speed: '10'
+  speed: '15'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '2.5'
 maxSpeed: '10'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB01.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB01.txt
index fef8e17..6820d5a 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB01.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB01.txt	
@@ -25,11 +25,11 @@ gunMounts:
 gunTypes:
 - bulletPrefab: tracerBullet
   bulletSize: '1.8'
   burst: '1'
   cooldown: '0'
-  damage: '0.3'
+  damage: '0.5'
   isPiercing: 'true'
   lifetime: '7'
   multi: '1'
   multiOffset:
   - '1'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB02.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB02.txt
index 9b0bd2a..74011b7 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB02.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB02.txt	
@@ -49,11 +49,11 @@ healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '12'
 maxSpeed: '3'
 maxTurnRate: '90'
-minSpeed: '3'
+minSpeed: '1'
 particlePositions:
 - name: darkSmoke
   pos:
   - '0.45'
   - '-0.3'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit.txt
index a624e7a..99d37f9 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit.txt	
@@ -1,66 +1,47 @@
 art: EnemySpirit
-artScale: '1'
+artScale: '0.7'
 colliderRadius: '0.35'
 colliderX: '0'
 colliderY: '-0.15'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
-- fireMode: JustShootDammit
-  firingArc: '360'
+- fireMode: Aimed
+  firingArc: '180'
   flashOffset: '0.75'
   gunTemplateName: spiritGrenadeLauncher
   mountAngle: '0'
   mountName: main
-  slewRate: '10'
+  slewRate: '60'
 gunTypes:
 - bulletPrefab: ringBullet
-  bulletSize: '1'
   burst: '1'
-  cooldown: '100'
-  damage: '1.5'
-  lifetime: '5'
-  multi: '3'
+  cooldown: '2'
+  damage: '0.7'
+  lifetime: '1.5'
+  multi: '1'
   multiSpread: '120'
   name: spiritGrenadeLauncher
   rof: '100'
-  speed: '1'
+  speed: '4'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '1'
+maxHitPoints: '0.1'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 particlePositions:
 - name: darkSmoke
   pos:
   - '0'
   - '-1.1'
   - '0'
   rot:
   - '0'
   - '0'
   - '0'
-- name: darkSmoke
-  pos:
-  - '0.4'
-  - '-0.65'
-  - '0.07'
-  rot:
-  - '0'
-  - '0'
-  - '0'
-- name: darkSmoke
-  pos:
-  - '-0.4'
-  - '-0.65'
-  - '0.07'
-  rot:
-  - '0'
-  - '0'
-  - '0'
-spawnInvulnerabilitySeconds: '2'
+spawnInvulnerabilitySeconds: '0'
 templateName: spirit
 tier: '3'
 xpMultiplier: '0'
diff --git config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit_controller.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit_controller.txt
new file mode 100644
index 0000000..40739a3
--- /dev/null
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit_controller.txt	
@@ -0,0 +1,27 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10'
+maxSpeed: '10'
+maxTurnRate: '120'
+minSpeed: '10'
+particlePositions:
+- name: darkSmokeSlow
+  pos:
+  - '0'
+  - '-0.31'
+  - '-0.452'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+showStats: never
+templateName: spirit_controller
+tier: '8'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader.txt
index 5fb1e3d..9a95982 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader.txt	
@@ -1,35 +1,36 @@
 art: EnemySpiritLeader
-artScale: '1'
+artScale: '1.5'
 colliderRadius: '0.7'
 colliderX: '0'
 colliderY: '-0.15'
 energyRegenRate: '0'
+explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: Aimed
-  firingArc: '360'
+  firingArc: '180'
   flashOffset: '0.4'
   gunTemplateName: spiritleaderLaser
   mountAngle: '0'
   mountName: main
-  slewRate: '0'
+  slewRate: '60'
 gunTypes:
-- bulletPrefab: bullet
-  burst: '4'
-  cooldown: '1'
-  damage: '1.9'
+- bulletPrefab: ringBullet
+  burst: '1'
+  cooldown: '2.5'
+  damage: '0.6'
   lifetime: '3'
-  multi: '4'
-  multiSpread: '90'
+  multi: '5'
+  multiSpread: '30'
   name: spiritleaderLaser
   range: '20'
   rof: '1'
   speed: '5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '20'
+maxHitPoints: '40'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 particlePositions:
 - name: darkSmoke
diff --git config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller.txt
new file mode 100644
index 0000000..9fe0575
--- /dev/null
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller.txt	
@@ -0,0 +1,27 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10'
+maxSpeed: '3'
+maxTurnRate: '120'
+minSpeed: '3'
+particlePositions:
+- name: darkSmokeSlow
+  pos:
+  - '0'
+  - '-0.31'
+  - '-0.452'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+showStats: never
+templateName: spiritleader_controller
+tier: '8'
+xpMultiplier: '0'
diff --git config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller2.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller2.txt
new file mode 100644
index 0000000..b62df07
--- /dev/null
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller2.txt	
@@ -0,0 +1,27 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10'
+maxSpeed: '5'
+maxTurnRate: '120'
+minSpeed: '5'
+particlePositions:
+- name: darkSmokeSlow
+  pos:
+  - '0'
+  - '-0.31'
+  - '-0.452'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+showStats: never
+templateName: spiritleader_controller2
+tier: '8'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP3_skull.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP3_skull.txt
index bd0a064..392b588 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP3_skull.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP3_skull.txt	
@@ -5,33 +5,61 @@ colliderX: '0'
 colliderY: '-0.1'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '180'
+  flashOffset: '1'
+  gunTemplateName: skullChargingLaser
+  mountAngle: '0'
+  mountName: charge
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '1'
+    sound: Enemy Laser Charging Medium
+  slewRate: '40'
+- fireMode: JustShootDammit
+  firingArc: '180'
   flashOffset: '0.8'
   gunTemplateName: skullGun
   mountAngle: '0'
   mountName: main
   offset:
   - '0'
   - '0.5'
   sfx:
-    pitch: '1'
-    sound: Enemy Machinegun Medium
+    pitch: '1.5'
+    sound: Enemy Shotgun Medium
   slewRate: '40'
+  syncOffset: '1'
+  syncTo: charge
 gunTypes:
 - bulletPrefab: bullet
   burst: '12'
-  cooldown: '2'
+  cooldown: '100000'
   damage: '1'
   lifetime: '0.8'
   multi: '4'
   multiSpread: '20'
   name: skullGun
   rof: '3'
   speed: '5'
   spread: '0'
+- bulletPalette: halo
+  bulletPrefab: ringBullet
+  bulletSize: '2'
+  burst: '10'
+  cooldown: '2'
+  damage: '0.1'
+  lifetime: '0.25'
+  multi: '1'
+  multiSpread: '0'
+  name: skullChargingLaser
+  rof: '10'
+  speed: '0'
+  spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '12.5'
 maxSpeed: '4'
 maxTurnRate: '120'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP4_zombieherder.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP4_zombieherder.txt
index 0d634a1..92ad5fb 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP4_zombieherder.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP4_zombieherder.txt	
@@ -1,7 +1,7 @@
 art: EnemyZombieHerder
-artScale: '1'
+artScale: '1.25'
 colliderRadius: '0.45'
 colliderX: '0'
 colliderY: '-0.2'
 energyRegenRate: '0'
 gunMounts:
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostship.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostship.txt
index dfc6db5..6e3c5e1 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostship.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostship.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 colliderHeight: '3'
 colliderWidth: '2'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
+explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: Aimed
   firingArc: '90'
   flashOffset: '0.8'
   gunTemplateName: ghostshipGun
@@ -32,33 +33,34 @@ gunMounts:
   sfx:
     pitch: '1'
     sound: Enemy Shotgun Medium
   slewRate: '0'
 gunTypes:
-- burst: '6'
+- burst: '9'
   cooldown: '3'
-  damage: '1.2'
+  damage: '1'
   lifetime: '3'
-  multi: '2'
+  multi: '3'
   multiSpread: '10'
   name: ghostshipGun
-  rof: '1'
+  rof: '2'
   speed: '4'
   spread: '0'
-- burst: '6'
-  cooldown: '5'
+- bulletPrefab: shurikenBullet
+  burst: '1'
+  cooldown: '4'
   damage: '1.2'
   lifetime: '2'
-  multi: '3'
-  multiSpread: '12'
+  multi: '1'
+  multiSpread: '1'
   name: ghostshipsideGun
   rof: '2'
-  speed: '4'
+  speed: '8'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '200'
+maxHitPoints: '150'
 maxSpeed: '2'
 maxTurnRate: '45'
 minSpeed: '2'
 spawnInvulnerabilitySeconds: '0'
 templateName: ghostship
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostshipghost1.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostshipghost1.txt
index 8ce7402..f544d88 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostshipghost1.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostshipghost1.txt	
@@ -11,23 +11,25 @@ gunMounts:
   gunTemplateName: ghostshipghost1Gun
   mountAngle: '0'
   mountName: anydir1
   slewRate: '360'
 gunTypes:
-- burst: '3'
-  cooldown: '1'
+- bulletPrefab: leisurelyBullet
+  burst: '1'
+  cooldown: '3'
   damage: '0.5'
   lifetime: '3'
   name: ghostshipghost1Gun
   rof: '0.5'
-  speed: '2.5'
+  speed: '5.7'
   spread: '15'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '12'
 maxSpeed: '2'
 maxTurnRate: '270'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: ghostshipghost1
 tier: '3'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP6_zombiequeen.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP6_zombiequeen.txt
index 9fd12f5..1777ad5 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP6_zombiequeen.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP6_zombiequeen.txt	
@@ -1,7 +1,7 @@
 art: EnemyZombieQueen
-artScale: '1.5'
+artScale: '1.9'
 colliderHeight: '1.5'
 colliderWidth: '1.1'
 colliderX: '0'
 colliderY: '-0.3'
 energyRegenRate: '0'
@@ -52,12 +52,19 @@ gunTypes:
   name: zombiequeenLaser
   rof: '0.3'
   speed: '2'
   spread: '0'
 healthRegenRate: '0'
+loot:
+  loot1:
+    lootTableId: tiernleader
+  loot2:
+    lootTable:
+    - weight: '100'
+    lootTableId: tiernleader
 maxEnergyPoints: '1'
-maxHitPoints: '35'
+maxHitPoints: '50'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 spawnInvulnerabilitySeconds: '2'
 templateName: zombiequeen
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombie28days.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombie28days.txt
index 52a5315..d202719 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombie28days.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombie28days.txt	
@@ -1,41 +1,43 @@
 art: EnemyZombie
-artScale: '1.3'
+artScale: '1.5'
 colliderRadius: '0.3'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
-explosionPrefab: ExplosionSmall
+explosionPrefab: Explosion
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '0.0'
+  flashOffset: '0'
   gunTemplateName: zombie28daysbite
   mountAngle: '0'
   mountName: main
   sfx:
     volume: '0.2'
   slewRate: '0'
 gunTypes:
-- bulletPrefab: freezeBullet
+- bulletPalette: all_color
+  bulletPrefab: freezeBullet
   bulletSize: '4'
-  burst: '5000'
-  cooldown: '2'
-  damage: '0.4'
+  burst: '100000'
+  cooldown: '1'
+  damage: '0.75'
   effect: Slow
   effectAmount: '0.5'
-  effectTime: '0.75'
-  lifetime: '0.75'
+  effectDamage: '0.001'
+  effectTime: '0.5'
+  lifetime: '0.5'
   multi: '1'
   multiSpread: '0'
   name: zombie28daysbite
-  rof: '2'
-  speed: '1'
-  spread: '0'
+  rof: '5'
+  speed: '0.25'
+  spread: '360'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '3'
+maxHitPoints: '18'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 spawnInvulnerabilitySeconds: '1'
 templateName: zombie28days
diff --git config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombieromero.txt config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombieromero.txt
index 7c5f6d0..2d9d645 100644
--- config_181210_2101/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombieromero.txt	
+++ config_190111_2315/Units/22 - Midlands (Ruins) - Ghosts_Spooky/xxx_zombieromero.txt	
@@ -6,31 +6,32 @@ colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '-0.5'
+  flashOffset: '1'
   gunTemplateName: zombieromerobite
   mountAngle: '0'
   mountName: main
   sfx:
     volume: '0.2'
   slewRate: '0'
 gunTypes:
-- bulletPrefab: freezeBullet
+- bulletPalette: all_color
+  bulletPrefab: freezeBullet
   bulletSize: '2.5'
   burst: '5000'
   cooldown: '2'
   damage: '0.2'
   effect: Slow
   effectAmount: '0.5'
-  effectTime: '0.75'
-  lifetime: '1'
+  effectTime: '0.5'
+  lifetime: '0.25'
   multi: '1'
   multiSpread: '0'
   name: zombieromerobite
-  rof: '1.5'
+  rof: '10'
   speed: '1'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '2'
diff --git config_181210_2101/Units/23 - Midlands (Rural) - Water_Aquatic/BOS1_whaleshark.txt config_190111_2315/Units/23 - Midlands (Rural) - Water_Aquatic/BOS1_whaleshark.txt
index 3036eeb..94a9255 100644
--- config_181210_2101/Units/23 - Midlands (Rural) - Water_Aquatic/BOS1_whaleshark.txt	
+++ config_190111_2315/Units/23 - Midlands (Rural) - Water_Aquatic/BOS1_whaleshark.txt	
@@ -1,7 +1,7 @@
 art: EnemyWhaleshark
-artScale: '1'
+artScale: '1.2'
 colliderHeight: '1.4'
 colliderRadius: '0'
 colliderWidth: '1'
 colliderX: '0'
 colliderY: '0.1'
diff --git config_181210_2101/Units/23 - Midlands (Rural) - Water_Aquatic/GRP1_mantaray.txt config_190111_2315/Units/23 - Midlands (Rural) - Water_Aquatic/GRP1_mantaray.txt
index 848c4ad..35bcba7 100644
--- config_181210_2101/Units/23 - Midlands (Rural) - Water_Aquatic/GRP1_mantaray.txt	
+++ config_190111_2315/Units/23 - Midlands (Rural) - Water_Aquatic/GRP1_mantaray.txt	
@@ -1,39 +1,76 @@
 art: EnemyMantaray
-artScale: '1'
+artScale: '1.5'
 colliderRadius: '1.1'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Hose
-  firingArc: '180'
-  flashOffset: '0.4'
+- fireMode: Sprinkler
+  firingArc: '0'
+  flashOffset: '0.5'
   gunTemplateName: mantarayfire
   mountAngle: '0'
   mountName: main
   offset:
   - '0'
   - '1'
-  slewRate: '40'
+  slewRate: '0'
+  sprinklerFlyback: 'false'
+  sprinklerIncrementAngle: '3.5'
+  sprinklerStartAngle: '-90'
+  sprinklerTurnbackAngle: '360'
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '1'
+  gunTypeConfig:
+    bulletPrefab: laserBullet
+    bulletSize: '0.75'
+    burst: '60'
+    cooldown: '1000'
+    damage: '0.3'
+    lifetime: '1.5'
+    multi: '2'
+    multiOffSet:
+    - '2'
+    - '0'
+    multiSpeed: '0.1'
+    multiSpread: '0'
+    name: hammer
+    rof: '10'
+    speed: '6'
+    spread: '20'
+  mountAngle: '0'
+  mountName: circle
+  sfx:
+    pitch: '1'
+    sound: Enemy Machinegun Medium
+  slewRate: '360'
+  syncOffset: '7'
+  syncTo: main
 gunTypes:
 - bulletPrefab: spinnerBullet
   bulletSize: '1.5'
-  burst: '5'
-  cooldown: '0'
-  damage: '1.5'
-  lifetime: '1.8'
+  burst: '100'
+  cooldown: '6.5'
+  damage: '1'
+  lifetime: '2'
+  multi: '2'
+  multiOffSet:
+  - '0'
+  - '3'
+  multiSpread: '180'
   name: mantarayfire
-  rof: '4'
-  speed: '6'
+  rof: '10'
+  speed: '4'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '20'
+maxHitPoints: '40'
 maxSpeed: '2.2'
 maxTurnRate: '30'
 minSpeed: '1.5'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robo.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robo.txt
index 8bcbb33..2e6e0b1 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robo.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robo.txt	
@@ -1,43 +1,91 @@
+additionalStates:
+  lasertower:
+  - name: initial
+    transitions:
+    - code: EnemyNear
+      toState: activatelaser
+      value: '15'
+  - events:
+    - code: Spawn
+      name: robotowerlaser
+      offset:
+        angle: '0'
+        distance: '0.1'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      name: robotowerlaser
+      offset:
+        angle: '180'
+        distance: '0.1'
+        isRelative: 'true'
+      value: '1'
+    name: activatelaser
+    transitions:
+    - code: Auto
+      toState: rest
+      value: '0'
+  - name: rest
+    transitions:
+    - code: Time
+      toState: initial
+      value: '6'
 art: EnemyRobotOfUnusualDesign
-artScale: '1'
-colliderRadius: '1.5'
+artScale: '2'
+bankSmoothing: '10000'
+colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
+explosionPrefab: ExplosionMed
 gunMounts:
-- fireMode: SprinklerTurnback
+- fireMode: Sprinkler
   firingArc: '360'
   flashOffset: '0.4'
   gunTemplateName: robogun
   mountAngle: '0'
   mountName: sweeper
   sfx:
     pitch: '1.8'
     sound: Enemy Machinegun Medium
+    volume: '0.7'
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '18'
+  sprinklerIncrementAngle: '10'
   sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '360'
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0'
   gunTemplateName: robomissile
   mountAngle: '180'
   mountName: missiles
   slewRate: '360'
+- fireMode: Sprinkler
+  firingArc: '0'
+  flashOffset: '10'
+  gunTemplateName: teslahqguide
+  mountAngle: '-90'
+  mountName: guide
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '9'
+  sprinklerStartAngle: '-90'
+  sprinklerTurnbackAngle: '8000'
 gunTypes:
 - bulletPrefab: bullet
-  bulletSize: '1.5'
-  burst: '10'
-  cooldown: '3'
+  bulletSize: '2'
+  burst: '45'
+  cooldown: '5'
   damage: '1'
-  lifetime: '8.0'
+  lifetime: '5'
   name: robogun
   rof: '10'
-  speed: '2'
+  speed: '4'
   spread: '0'
 - bulletPrefab: leisurelyBullet
   burst: '9'
   cooldown: '3'
   damage: '1'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshield.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshield.txt
index 7322bec..15ca5b8 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshield.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshield.txt	
@@ -1,17 +1,75 @@
+additionalStates:
+  laymines:
+  - name: initial
+    transitions:
+    - code: ChooseTransition
+      options:
+      - toState: wait1
+        weight: '25'
+      - toState: wait2
+        weight: '25'
+      - toState: wait3
+        weight: '25'
+      - toState: wait4
+        weight: '25'
+  - name: wait1
+    transitions:
+    - code: Time
+      toState: checkformines
+      value: '1'
+  - name: wait2
+    transitions:
+    - code: Time
+      toState: checkformines
+      value: '2'
+  - name: wait3
+    transitions:
+    - code: Time
+      toState: checkformines
+      value: '3'
+  - name: wait4
+    transitions:
+    - code: Time
+      toState: checkformines
+      value: '4'
+  - name: checkformines
+    transitions:
+    - code: NoTypeNear
+      name: robomineshieldgrenade
+      toState: laymine
+      value: '5'
+    - code: Auto
+      toState: wait1
+      value: '0'
+  - events:
+    - code: Spawn
+      delay: '0'
+      maxChildren: '3'
+      name: robomineshieldgrenade
+      offset:
+        angle: '0'
+        distance: '0'
+        isRelative: 'true'
+      value: '1'
+    name: laymine
+    transitions:
+    - code: Auto
+      toState: initial
+      value: '0'
 art: EnemyRobotOfUnusualDesignMinion
-artScale: '1'
+artScale: '1.25'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
-maxHitPoints: '50'
+maxHitPoints: '22'
 maxSpeed: '10'
 maxTurnRate: '270'
 minSpeed: '0'
 templateName: robomineshield
 tier: '5'
-xpMultiplier: '0'
+xpMultiplier: '1'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshieldgrenade.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshieldgrenade.txt
index 5698e63..183f782 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshieldgrenade.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP1_robomineshieldgrenade.txt	
@@ -1,37 +1,39 @@
-art: EnemyRoboMine
-artScale: '1'
+art: EnemySecretPoliceMine
+artScale: '1.25'
 colliderRadius: '0.4'
 energyRegenRate: '0'
-explosionPrefab: ExplosionSmall_Hazard_Mild
+explosionPrefab: ExplosionMed_Hazard_Medium
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '1'
   gunTemplateName: robomineshieldgrenadegun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
 - bulletPrefab: leisurelyBullet
+  bulletSize: '1.5'
   burst: '5'
   cooldown: '10'
-  damage: '1'
-  lifetime: '1.5'
-  multi: '4'
-  multiSpread: '90'
+  damage: '0.5'
+  isPiercing: 'true'
+  lifetime: '3'
+  multi: '12'
+  multiSpread: '30'
   name: robomineshieldgrenadegun
   rof: '0.3'
   speed: '1'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
-maxHitPoints: '2'
+maxHitPoints: '5'
 maxSpeed: '0'
-maxTurnRate: '0'
+maxTurnRate: '720'
 minSpeed: '0'
 noScribing: 'true'
-spawnInvulnerabilitySeconds: '0'
+spawnInvulnerabilitySeconds: '1'
 templateName: robomineshieldgrenade
 tier: '5'
 xpMultiplier: '0'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP2_flakblimp2exploder.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP2_flakblimp2exploder.txt
index cca9bca..57a712b 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP2_flakblimp2exploder.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP2_flakblimp2exploder.txt	
@@ -1,31 +1,36 @@
 art: EnemyBrotherBomberBomb
-artScale: '1.33'
+artScale: '1.5'
 colliderRadius: '0.3'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: Explosion_Hazard_Mild
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '0.75'
+  flashOffset: '0'
   gunTemplateName: flakblimp2GrenadeLauncher
   mountAngle: '0'
   mountName: main
+  sfx:
+    pitch: '0.5'
+    sound: Explosion Hazardous Deadly 1
   slewRate: '0'
 gunTypes:
-- bulletPrefab: bullet
+- bulletPrefab: leisurelyBullet
+  bulletSize: '13'
   burst: '4'
   cooldown: '3'
-  damage: '1'
-  lifetime: '0.2'
-  multi: '16'
+  damage: '3'
+  isPiercing: 'true'
+  lifetime: '0.4'
+  multi: '1'
   multiSpread: '22.5'
   name: flakblimp2GrenadeLauncher
   rof: '1'
-  speed: '4'
+  speed: '0'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '3'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwo.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwo.txt
index da479c7..6c5a02e 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwo.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwo.txt	
@@ -13,17 +13,62 @@ gunMounts:
   mountAngle: '0'
   mountName: main
   sfx:
     sound: Enemy Laser Loop3
   slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '0'
+  gunTypeConfig:
+    bulletPrefab: tracerBullet
+    bulletSize: '1'
+    burst: '2000000'
+    cooldown: '2'
+    damage: '0.3'
+    lifetime: '4'
+    multi: '2'
+    multiOffset:
+    - '0'
+    - '0.75'
+    multiSpread: '0'
+    name: hammer
+    rof: '20'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: hop
+  sfx:
+    sound: Enemy Laser Loop5
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '0'
+  gunTypeConfig:
+    bulletPrefab: ringBullet
+    bulletSize: '2'
+    burst: '1'
+    cooldown: '5'
+    damage: '0.3'
+    lifetime: '4'
+    multi: '1'
+    multiSpread: '0'
+    name: hammer
+    rof: '3'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: nothop
+  sfx:
+    sound: Enemy Laser Loop5
+  slewRate: '0'
 gunTypes:
-- bulletPrefab: laserBullet
+- bulletPrefab: tracerBullet
   burst: '13'
   cooldown: '10'
-  damage: '0.4'
-  lifetime: '0.75'
-  multi: '2'
+  damage: '0.3'
+  lifetime: '2'
+  multi: '1'
   multiSpread: '20'
   name: hoppertwoLaser
   rof: '10'
   speed: '10'
   spread: '0'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwoleader.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwoleader.txt
index 75acfeb..8ed77f1 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwoleader.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwoleader.txt	
@@ -1,35 +1,35 @@
 art: EnemyMegapouncer
-artScale: '1'
+artScale: '1.3'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0.4'
   gunTemplateName: hoppertwoleaderLaser
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
-- bulletPrefab: leisurelyBullet
+- bulletPrefab: shurikenBullet
   burst: '4'
   cooldown: '1'
   damage: '0.75'
-  lifetime: '3'
+  lifetime: '2'
   multi: '1'
   multiSpread: '0'
   name: hoppertwoleaderLaser
   range: '50'
   rof: '4'
-  speed: '3'
+  speed: '5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '20'
+maxHitPoints: '30'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP4_broadside.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP4_broadside.txt
index 33d98b0..4e8a714 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP4_broadside.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP4_broadside.txt	
@@ -56,6 +56,6 @@ maxTurnRate: '40'
 minSpeed: '2'
 showGunSignal: 'true'
 spawnInvulnerabilitySeconds: '2'
 templateName: broadside
 tier: '5'
-xpMultiplier: '2'
+xpMultiplier: '3'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP4_highgnat.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP4_highgnat.txt
index 651847d..a10eb99 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/GRP4_highgnat.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/GRP4_highgnat.txt	
@@ -42,6 +42,6 @@ maxSpeed: '8'
 maxTurnRate: '30'
 minSpeed: '2'
 spawnInvulnerabilitySeconds: '2'
 templateName: highgnat
 tier: '5'
-xpMultiplier: '2'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/SLO3_shmupblimp3.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/SLO3_shmupblimp3.txt
index db702f1..2af7742 100644
--- config_181210_2101/Units/31 - Highlands (City) - MadScience_Energy/SLO3_shmupblimp3.txt	
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/SLO3_shmupblimp3.txt	
@@ -71,11 +71,11 @@ gunTypes:
   damage: '1'
   lifetime: '8.0'
   multi: '1'
   multiSpread: '0'
   name: shmupblimp3gun3
-  rof: '5'
+  rof: '10'
   speed: '2'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '50'
diff --git config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/XXX_robotowerlaser.txt config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/XXX_robotowerlaser.txt
new file mode 100644
index 0000000..2b39290
--- /dev/null
+++ config_190111_2315/Units/31 - Highlands (City) - MadScience_Energy/XXX_robotowerlaser.txt	
@@ -0,0 +1,42 @@
+art: '!EnemyShivaLaser'
+artScale: '1.82'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '10'
+  gunTemplateName: robotowerlasermine
+  mountAngle: '0'
+  mountName: main
+  sfx:
+    sound: Enemy Laser Loop6
+  slewRate: '0'
+gunTypes:
+- bulletPrefab: leisurelyBullet
+  bulletSize: '1.5'
+  burst: '20'
+  cooldown: '0'
+  damage: '0.2'
+  effect: Burn
+  effectAmount: '0.83'
+  effectTime: '3.0'
+  lifetime: '2'
+  name: robotowerlasermine
+  rof: '20'
+  speed: '0'
+  spread: '0'
+healthRegenRate: '0'
+isVisibleToAI: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000001'
+maxSpeed: '0.001'
+maxTurnRate: '180'
+minSpeed: '0.001'
+spawnInvulnerabilitySeconds: '0'
+templateName: robotowerlaser
+tier: '4'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/GRP3_hurtsnakeleader.txt config_190111_2315/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/GRP3_hurtsnakeleader.txt
index 13d8fb4..cbf780d 100644
--- config_181210_2101/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/GRP3_hurtsnakeleader.txt	
+++ config_190111_2315/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/GRP3_hurtsnakeleader.txt	
@@ -20,12 +20,12 @@ gunTypes:
   bulletSize: '2'
   burst: '1'
   cooldown: '3'
   damage: '1'
   lifetime: '10'
-  multi: '3'
-  multiSpread: '10'
+  multi: '5'
+  multiSpread: '15'
   name: hurtsnakeleaderTripleShotGun
   range: '16'
   rof: '2.5'
   speed: '1'
   spread: '0'
diff --git config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/SLO-tetra.txt config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/SLO-tetra.txt
index 79c1fe2..7474d66 100644
--- config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/SLO-tetra.txt	
+++ config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/SLO-tetra.txt	
@@ -145,11 +145,11 @@ gunMounts:
     pitch: '0.5'
     sound: Enemy Machinegun Medium
   slewRate: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '120'
+maxHitPoints: '60'
 maxSpeed: '3'
 maxTurnRate: '120'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: tetra
diff --git config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/SLO1_scorpion.txt config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/SLO1_scorpion.txt
index 105abe0..1749566 100644
--- config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/SLO1_scorpion.txt	
+++ config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/SLO1_scorpion.txt	
@@ -6,26 +6,24 @@ colliderY: '0'
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
 energyRegenRate: '0'
 gunMounts:
-- fireMode: JustShootDammit
-  firingArc: '180'
-  flashOffset: '0.0'
+- fireMode: Hose
+  firingArc: '60'
+  flashOffset: '1'
   gunTemplateName: scorpionAlwaysOnGun
   mountAngle: '0'
   mountName: scorpionAlwaysOnMount
   offset:
   - '0'
   - '0.5'
   sfx:
-    sound: Enemy bullet fast small_1
-    volume: '1'
-  signalTime: '5'
-  slewRate: '270'
-  syncOffset: '1'
-  syncTo: scorpionSpecialMount
+    pitch: '0.5'
+    sound: Enemy Laser Loop3
+  signalTime: '0'
+  slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '1.6'
   gunTemplateName: scorpionSpecialGun
   mountAngle: '180'
@@ -36,18 +34,18 @@ gunMounts:
   sfx:
     pitch: '0.75'
     sound: Enemy Shotgun Deadly
   slewRate: '0'
 gunTypes:
-- bulletPrefab: bullet
+- bulletPrefab: shurikenBullet
   bulletSize: '1.5'
-  burst: '8'
+  burst: '5'
   cooldown: '0'
-  damage: '1.5'
-  lifetime: '0.8'
+  damage: '0.3'
+  lifetime: '0.25'
   name: scorpionAlwaysOnGun
-  rof: '3'
+  rof: '10'
   speed: '5'
   spread: '0'
 - bulletPrefab: freezeBullet
   bulletSize: '2'
   burst: '8'
diff --git config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/unit_blink.txt config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/unit_blink.txt
index c43d44c..4aa9c9a 100644
--- config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/unit_blink.txt	
+++ config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/unit_blink.txt	
@@ -27,11 +27,11 @@ gunMounts:
   mountName: main
   slewRate: '180'
 hashOverride: '7778'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '45'
+maxHitPoints: '40'
 maxSpeed: '3'
 maxTurnRate: '120'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: blink
diff --git config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/unit_blinkleader.txt config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/unit_blinkleader.txt
index f758964..6597f11 100644
--- config_181210_2101/Units/33 - Highlands (Rural) - Desert_Bones/unit_blinkleader.txt	
+++ config_190111_2315/Units/33 - Highlands (Rural) - Desert_Bones/unit_blinkleader.txt	
@@ -4,12 +4,19 @@ bankSmoothing: '10000'
 colliderRadius: '0.7'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 healthRegenRate: '0'
+loot:
+  loot1:
+    lootTableId: tiernleader
+  loot2:
+    lootTable:
+    - weight: '100'
+    lootTableId: tiernleader
 maxEnergyPoints: '1'
-maxHitPoints: '40'
+maxHitPoints: '45'
 maxSpeed: '0'
 maxTurnRate: '120'
 minSpeed: '0'
 particlePositions:
 - name: darkSmokeSlow
diff --git config_181210_2101/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt.txt config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt.txt
index deb6723..f876fc6 100644
--- config_181210_2101/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt.txt	
+++ config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt.txt	
@@ -5,33 +5,33 @@ colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: Aimed
-  firingArc: '180'
+  firingArc: '90'
   flashOffset: '0.33'
   gunTypeConfig:
     bulletPrefab: octagonBullet
     bulletSize: '2.5'
     burst: '1'
     cooldown: '2'
-    damage: '1.5'
-    lifetime: '4'
+    damage: '0.8'
+    lifetime: '3'
     name: highmountaingruntGun
     range: '8'
     rof: '3'
-    speed: '3.0'
+    speed: '6'
     spread: '0'
-  mountAngle: '180'
+  mountAngle: '0'
   mountName: main
-  slewRate: '360'
+  slewRate: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '60'
-maxSpeed: '2'
+maxHitPoints: '15'
+maxSpeed: '8'
 maxTurnRate: '30'
-minSpeed: '0.8'
+minSpeed: '0'
 particlePositions:
 - name: darkSmoke
   pos:
   - '0.24'
   - '-0.36'
diff --git config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt_controller.txt config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt_controller.txt
new file mode 100644
index 0000000..d1a3e2c
--- /dev/null
+++ config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP1_highmountaingrunt_controller.txt	
@@ -0,0 +1,27 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '10'
+maxSpeed: '10'
+maxTurnRate: '120'
+minSpeed: '10'
+particlePositions:
+- name: darkSmokeSlow
+  pos:
+  - '0'
+  - '-0.31'
+  - '-0.452'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+showStats: never
+templateName: highmountaingrunt_controller
+tier: '8'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjaleaderballnchain.txt config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjaleaderballnchain.txt
index b9c248b..65169e9 100644
--- config_181210_2101/Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjaleaderballnchain.txt	
+++ config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjaleaderballnchain.txt	
@@ -12,10 +12,13 @@ gunMounts:
   firingArc: '360'
   flashOffset: '0.0'
   gunTemplateName: ninjaleaderballnchainGrenadeLauncher
   mountAngle: '0'
   mountName: main
+  sfx:
+    pitch: '1'
+    sound: Enemy Loop Missile Mild
   slewRate: '0'
 gunTypes:
 - bulletPrefab: fireBullet
   burst: '500'
   cooldown: '0'
diff --git config_181210_2101/Units/51 - HighMountains (City) - Alien_Hologram/SLO-barragermissile.txt config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/SLO-barragermissile.txt
index 073e0e9..dec96fa 100644
--- config_181210_2101/Units/51 - HighMountains (City) - Alien_Hologram/SLO-barragermissile.txt	
+++ config_190111_2315/Units/51 - HighMountains (City) - Alien_Hologram/SLO-barragermissile.txt	
@@ -22,10 +22,13 @@ gunMounts:
     rof: '8'
     speed: '0.1'
     spread: '360'
   mountAngle: '0'
   mountName: main
+  sfx:
+    pitch: '1'
+    sound: Enemy Loop Missile Mild
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0.2'
   gunTypeConfig:
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_blizzardcore.txt config_190111_2315/Units/61D - Ice Dungeon/unit_blizzardcore.txt
index d96853c..81d635b 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_blizzardcore.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_blizzardcore.txt	
@@ -7,11 +7,11 @@ energyRegenRate: '0'
 explosionPrefab: ExplosionBig_NoDebris
 gunMounts:
 - fireMode: Aimed
   firingArc: '360'
   flashOffset: '0.0'
-  gunTemplateName: SpotterTripleShotGun
+  gunTemplateName: blizzardcoreTripleShotGun
   mountAngle: '0'
   mountName: blizzardcoreTripleShotMount
   sfx:
     sound: Enemy Shotgun Medium
   signalTime: '2'
diff --git config_190111_2315/Units/61D - Ice Dungeon/unit_blizzardiciclesmaster_noxp.txt config_190111_2315/Units/61D - Ice Dungeon/unit_blizzardiciclesmaster_noxp.txt
new file mode 100644
index 0000000..e823d4a
--- /dev/null
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_blizzardiciclesmaster_noxp.txt	
@@ -0,0 +1,49 @@
+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'
+isVisibleToAI: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '0'
+maxTurnRate: '50'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: blizzardiciclesmaster_noxp
+tier: '10'
+xpMultiplier: '0.15'
diff --git config_190111_2315/Units/61D - Ice Dungeon/unit_frostgiant_noxp.txt config_190111_2315/Units/61D - Ice Dungeon/unit_frostgiant_noxp.txt
new file mode 100644
index 0000000..25d6415
--- /dev/null
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_frostgiant_noxp.txt	
@@ -0,0 +1,34 @@
+art: EnemyFrostGiant
+artScale: '1'
+colliderRadius: '0.9'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+gunMounts:
+- fireMode: Aimed
+  firingArc: '360'
+  flashOffset: '1.4'
+  gunTemplateName: frostgiantLaser
+  mountAngle: '0'
+  mountName: main
+  slewRate: '0'
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '40'
+maxSpeed: '2'
+maxTurnRate: '55'
+minSpeed: '2'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '-0.007'
+  - '-0.71'
+  - '-1.75'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+templateName: frostgiant_noxp
+tier: '10'
+xpMultiplier: '0.15'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode1.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode1.txt
index 42a37d1..64ba62d 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode1.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode1.txt	
@@ -45,5 +45,6 @@ maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: icebossnode1
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode2.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode2.txt
index e0620ed..a3f1e40 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode2.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode2.txt	
@@ -45,5 +45,6 @@ maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: icebossnode2
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode3.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode3.txt
index aa170d1..e2036a7 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode3.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode3.txt	
@@ -45,5 +45,6 @@ maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: icebossnode3
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode4.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode4.txt
index 92b556e..9e903fc 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode4.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode4.txt	
@@ -45,5 +45,6 @@ maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: icebossnode4
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode5.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode5.txt
index 7aebb90..f46d1af 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode5.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode5.txt	
@@ -45,5 +45,6 @@ maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: icebossnode5
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode6.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode6.txt
index 02fb636..0e63191 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnode6.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnode6.txt	
@@ -45,5 +45,6 @@ maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '3'
 templateName: icebossnode6
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt
index 29a792b..040cf10 100644
--- config_181210_2101/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt	
+++ config_190111_2315/Units/61D - Ice Dungeon/unit_icebossnodemaster.txt	
@@ -276,5 +276,6 @@ maxSpeed: '0'
 maxTurnRate: '30'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: icebossnodemaster
 tier: '10'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/63D - Bomb Dungeon/unit_altar.txt config_190111_2315/Units/63D - Bomb Dungeon/GRP1_altar.txt
similarity index 100%
rename from config_181210_2101/Units/63D - Bomb Dungeon/unit_altar.txt
rename to config_190111_2315/Units/63D - Bomb Dungeon/GRP1_altar.txt
diff --git config_181210_2101/Units/63D - Bomb Dungeon/unit_bombguard.txt config_190111_2315/Units/63D - Bomb Dungeon/GRP1_bombguard.txt
similarity index 99%
rename from config_181210_2101/Units/63D - Bomb Dungeon/unit_bombguard.txt
rename to config_190111_2315/Units/63D - Bomb Dungeon/GRP1_bombguard.txt
index 563d8ec..a712b20 100644
--- config_181210_2101/Units/63D - Bomb Dungeon/unit_bombguard.txt	
+++ config_190111_2315/Units/63D - Bomb Dungeon/GRP1_bombguard.txt	
@@ -103,6 +103,6 @@ maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: bombguard
 tier: '2'
-xpMultiplier: '1.4'
+xpMultiplier: '0.5'
diff --git config_181210_2101/Units/63D - Bomb Dungeon/SLO1_flakblimpexploder.txt config_190111_2315/Units/63D - Bomb Dungeon/SLO1_flakblimpexploder.txt
index bf607f9..1bb8f96 100644
--- config_181210_2101/Units/63D - Bomb Dungeon/SLO1_flakblimpexploder.txt	
+++ config_190111_2315/Units/63D - Bomb Dungeon/SLO1_flakblimpexploder.txt	
@@ -26,11 +26,11 @@ gunTypes:
   speed: '2'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
-maxHitPoints: '5'
+maxHitPoints: '3'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 noScribing: 'true'
 spawnInvulnerabilitySeconds: '0'
diff --git config_181210_2101/Units/63D - Bomb Dungeon/SLO1_flakblimpexploderstrong.txt config_190111_2315/Units/63D - Bomb Dungeon/SLO1_flakblimpexploderstrong.txt
index eae7920..d628fef 100644
--- config_181210_2101/Units/63D - Bomb Dungeon/SLO1_flakblimpexploderstrong.txt	
+++ config_190111_2315/Units/63D - Bomb Dungeon/SLO1_flakblimpexploderstrong.txt	
@@ -26,11 +26,11 @@ gunTypes:
   speed: '2'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
-maxHitPoints: '5'
+maxHitPoints: '4'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 noScribing: 'true'
 spawnInvulnerabilitySeconds: '0'
diff --git config_181210_2101/Units/63D - Bomb Dungeon/SLO1_bomberjetexploder.txt config_190111_2315/Units/63D - Bomb Dungeon/SLO3_bomberjetexploder.txt
similarity index 100%
rename from config_181210_2101/Units/63D - Bomb Dungeon/SLO1_bomberjetexploder.txt
rename to config_190111_2315/Units/63D - Bomb Dungeon/SLO3_bomberjetexploder.txt
diff --git config_181210_2101/Units/64D - Obstacle Dungeon/SLO_wavemasterminion.txt config_190111_2315/Units/64D - Obstacle Dungeon/BOS2_wavemasterminion.txt
similarity index 100%
rename from config_181210_2101/Units/64D - Obstacle Dungeon/SLO_wavemasterminion.txt
rename to config_190111_2315/Units/64D - Obstacle Dungeon/BOS2_wavemasterminion.txt
diff --git config_181210_2101/Units/64D - Obstacle Dungeon/SLO_fathuntermini.txt config_190111_2315/Units/64D - Obstacle Dungeon/SLO_fathuntermini.txt
index f6375d8..786336c 100644
--- config_181210_2101/Units/64D - Obstacle Dungeon/SLO_fathuntermini.txt	
+++ config_190111_2315/Units/64D - Obstacle Dungeon/SLO_fathuntermini.txt	
@@ -24,11 +24,11 @@ gunTypes:
   rof: '2.5'
   speed: '3'
   spread: '10'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '35'
+maxHitPoints: '20'
 maxSpeed: '3.5'
 maxTurnRate: '40'
 minSpeed: '1.5'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/64D - Obstacle Dungeon/SLO_shockwaver.txt config_190111_2315/Units/64D - Obstacle Dungeon/SLO_shockwaver.txt
index a94a678..61eaee6 100644
--- config_181210_2101/Units/64D - Obstacle Dungeon/SLO_shockwaver.txt	
+++ config_190111_2315/Units/64D - Obstacle Dungeon/SLO_shockwaver.txt	
@@ -7,11 +7,11 @@ energyRegenRate: '0'
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '1.3'
   gunTemplateName: shockwaverGun
-  mountAngle: '0'
+  mountAngle: '180'
   mountName: main
   slewRate: '180'
 gunTypes:
 - burst: '1'
   cooldown: '5'
diff --git config_181210_2101/Units/64D - Obstacle Dungeon/SLO_turbine.txt config_190111_2315/Units/64D - Obstacle Dungeon/SLO_turbine.txt
index 9a0e551..dd25f4d 100644
--- config_181210_2101/Units/64D - Obstacle Dungeon/SLO_turbine.txt	
+++ config_190111_2315/Units/64D - Obstacle Dungeon/SLO_turbine.txt	
@@ -1,8 +1,8 @@
 art: EnemyMincerPrefab
 artScale: '1'
-colliderRadius: '0.42'
+colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
 - fireMode: Sprinkler
@@ -109,11 +109,11 @@ gunMounts:
 gunTypes:
 - bulletPrefab: laserBullet
   burst: '10000000'
   cooldown: '0'
   damage: '1'
-  lifetime: '0.33'
+  lifetime: '0.6'
   multi: '5'
   multiSpread: '72'
   name: turbineGun
   rof: '2'
   speed: '0'
@@ -131,11 +131,11 @@ gunTypes:
   spread: '0'
 - bulletPrefab: laserBullet
   burst: '100000000'
   cooldown: '0'
   damage: '1'
-  lifetime: '0.125'
+  lifetime: '0.25'
   multi: '3'
   multiSpread: '120'
   name: turbineGun3shot3
   rof: '8'
   speed: '0'
diff --git config_181210_2101/Units/65D - Grindhouse Dungeon/BOS_summonerzombie28days.txt config_190111_2315/Units/65D - Grindhouse Dungeon/BOS_summonerzombie28days.txt
index 1d6e3cb..159d1b5 100644
--- config_181210_2101/Units/65D - Grindhouse Dungeon/BOS_summonerzombie28days.txt	
+++ config_190111_2315/Units/65D - Grindhouse Dungeon/BOS_summonerzombie28days.txt	
@@ -7,32 +7,32 @@ elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.0'
   gunTemplateName: summonerzombie28daysbite
   mountAngle: '0'
   mountName: main
   slewRate: '45'
 gunTypes:
 - bulletPrefab: freezeBullet
   bulletSize: '2'
-  burst: '1'
-  cooldown: '2'
-  damage: '1.5'
-  effect: Lightning
-  effectAmount: '0.1'
-  effectDamage: '0.5'
-  effectTime: '0.1'
+  burst: '100000'
+  cooldown: '1'
+  damage: '0.25'
+  effect: Slow
+  effectAmount: '0.5'
+  effectDamage: '0.001'
+  effectTime: '1'
   lifetime: '1'
   multi: '1'
   multiSpread: '0'
   name: summonerzombie28daysbite
-  rof: '1'
+  rof: '5'
   speed: '1.25'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '15'
diff --git config_181210_2101/Units/65D - Grindhouse Dungeon/unit_evohatcher.txt config_190111_2315/Units/65D - Grindhouse Dungeon/unit_evohatcher.txt
index 0dd8472..9097f4a 100644
--- config_181210_2101/Units/65D - Grindhouse Dungeon/unit_evohatcher.txt	
+++ config_190111_2315/Units/65D - Grindhouse Dungeon/unit_evohatcher.txt	
@@ -1,7 +1,7 @@
 art: EnemyRadiantWomb
-artScale: '1'
+artScale: '1.6'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - slowWeakness
diff --git config_181210_2101/Units/65D - Grindhouse Dungeon/unit_teslaclone.txt config_190111_2315/Units/65D - Grindhouse Dungeon/unit_teslaclone.txt
index aab1506..bb1a38f 100644
--- config_181210_2101/Units/65D - Grindhouse Dungeon/unit_teslaclone.txt	
+++ config_190111_2315/Units/65D - Grindhouse Dungeon/unit_teslaclone.txt	
@@ -5,13 +5,34 @@ colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
+gunMounts:
+- fireMode: Aimed
+  firingArc: '160'
+  flashOffset: '1'
+  gunTypeConfig:
+    bulletPrefab: ringBullet
+    burst: '1'
+    cooldown: '2'
+    damage: '0.5'
+    lifetime: '2'
+    multi: '3'
+    multiSpread: '120'
+    name: hammer
+    rof: '1'
+    speed: '3'
+    spread: '0'
+  mountAngle: '0'
+  mountName: main
+  sfx:
+    sound: Enemy Laser Loop5
+  slewRate: '90'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '60'
+maxHitPoints: '40'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 particlePositions:
 - name: darkSmoke
diff --git config_181210_2101/Units/65D - Grindhouse Dungeon/unit_teslaclonelaser.txt config_190111_2315/Units/65D - Grindhouse Dungeon/unit_teslaclonelaser.txt
index b8528ef..e5c6804 100644
--- config_181210_2101/Units/65D - Grindhouse Dungeon/unit_teslaclonelaser.txt	
+++ config_190111_2315/Units/65D - Grindhouse Dungeon/unit_teslaclonelaser.txt	
@@ -26,13 +26,13 @@ gunTypes:
   cooldown: '0'
   damage: '0.1'
   effect: Burn
   effectAmount: '0.7'
   effectTime: '3.0'
-  lifetime: '6'
+  lifetime: '2'
   name: teslaclonelasermine
-  rof: '15'
+  rof: '20'
   speed: '0'
   spread: '0'
 healthRegenRate: '0'
 isVisibleToAI: 'false'
 maxEnergyPoints: '1'
diff --git config_181210_2101/Units/65D - Grindhouse Dungeon/unit_zombiehatcher.txt config_190111_2315/Units/65D - Grindhouse Dungeon/unit_zombiehatcher.txt
index fa648e1..d6c56f6 100644
--- config_181210_2101/Units/65D - Grindhouse Dungeon/unit_zombiehatcher.txt	
+++ config_190111_2315/Units/65D - Grindhouse Dungeon/unit_zombiehatcher.txt	
@@ -1,18 +1,18 @@
 art: EnemyRadiantWomb
-artScale: '1'
+artScale: '1.6'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionBig2
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '50'
+maxHitPoints: '25'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 spawnInvulnerabilitySeconds: '0'
 templateName: zombiehatcher
diff --git config_190111_2315/Units/65D - Grindhouse Dungeon/unit_zombieshatcherzombie.txt config_190111_2315/Units/65D - Grindhouse Dungeon/unit_zombieshatcherzombie.txt
new file mode 100644
index 0000000..27168b5
--- /dev/null
+++ config_190111_2315/Units/65D - Grindhouse Dungeon/unit_zombieshatcherzombie.txt	
@@ -0,0 +1,54 @@
+art: EnemyEdmundExperiment
+artScale: '1'
+colliderRadius: '1.2'
+colliderX: '0'
+colliderY: '0'
+elementSusceptibilityIds:
+- slowWeakness
+- lightningResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionSmall
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0.0'
+  gunTemplateName: zombieshatcherzombiebite
+  mountAngle: '0'
+  mountName: main
+  slewRate: '0'
+gunTypes:
+- bulletPrefab: freezeBullet
+  bulletSize: '2'
+  burst: '100000'
+  cooldown: '1'
+  damage: '0.25'
+  effect: Slow
+  effectAmount: '0.5'
+  effectDamage: '0.001'
+  effectTime: '1'
+  lifetime: '1'
+  multi: '1'
+  multiSpread: '0'
+  name: zombieshatcherzombiebite
+  rof: '5'
+  speed: '1.25'
+  spread: '0'
+healthRegenRate: '0'
+maxEnergyPoints: '1'
+maxHitPoints: '15'
+maxSpeed: '1.5'
+maxTurnRate: '55'
+minSpeed: '0.8'
+particlePositions:
+- name: darkSmoke
+  pos:
+  - '0.75'
+  - '-0.385'
+  - '-1'
+  rot:
+  - '0'
+  - '0'
+  - '-90'
+spawnInvulnerabilitySeconds: '2'
+templateName: zombieshatcherzombie
+tier: '6'
diff --git config_181210_2101/Units/68D - Eyeball Dungeon/unit_orbiter.txt config_190111_2315/Units/68D - Eyeball Dungeon/unit_orbiter.txt
index ae05be3..1b4c8dd 100644
--- config_181210_2101/Units/68D - Eyeball Dungeon/unit_orbiter.txt	
+++ config_190111_2315/Units/68D - Eyeball Dungeon/unit_orbiter.txt	
@@ -24,14 +24,14 @@ gunMounts:
   gunTemplateName: orbiterminegun
   mountAngle: '0'
   mountName: main2
   slewRate: '0'
 gunTypes:
-- bulletPrefab: laserBullet
-  burst: '5'
-  cooldown: '0.25'
-  damage: '0.4'
+- bulletPrefab: shurikenBullet
+  burst: '1'
+  cooldown: '2'
+  damage: '0.7'
   effect: Water
   effectAmount: '0.1'
   effectDamage: '0.3'
   effectTime: '0.1'
   lifetime: '5'
diff --git config_181210_2101/Units/68D - Eyeball Dungeon/unit_scanner.txt config_190111_2315/Units/68D - Eyeball Dungeon/unit_scanner.txt
index bb46873..4662c25 100644
--- config_181210_2101/Units/68D - Eyeball Dungeon/unit_scanner.txt	
+++ config_190111_2315/Units/68D - Eyeball Dungeon/unit_scanner.txt	
@@ -1,104 +1,130 @@
 art: EnemyScanner
-artScale: '1'
+artScale: '1.5'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
-  flashOffset: '1'
+  flashOffset: '2'
   gunTemplateName: scannergun1
   mountAngle: '0'
   mountName: main
   sfx:
-    pitch: '1'
-    sound: Enemy Laser Loop3
+    pitch: '0.5'
+    sound: Enemy Laser Loop16
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '10'
+  sprinklerIncrementAngle: '5'
   sprinklerStartAngle: '-90'
   sprinklerTurnbackAngle: '90'
+  syncOffset: '1'
+  syncTo: warning
 - fireMode: SprinklerTurnback
   firingArc: '360'
-  flashOffset: '2'
+  flashOffset: '3'
   gunTemplateName: scannergun1
   mountAngle: '0'
   mountName: main2
   sfx:
     sound: 'null'
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '10'
+  sprinklerIncrementAngle: '5'
   sprinklerStartAngle: '-90'
   sprinklerTurnbackAngle: '90'
   syncOffset: '0.25'
   syncTo: main
 - fireMode: SprinklerTurnback
   firingArc: '360'
-  flashOffset: '3'
+  flashOffset: '4'
   gunTemplateName: scannergun1
   mountAngle: '0'
   mountName: main3
   sfx:
     sound: 'null'
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '10'
+  sprinklerIncrementAngle: '5'
   sprinklerStartAngle: '-90'
   sprinklerTurnbackAngle: '90'
   syncOffset: '0.5'
   syncTo: main
 - fireMode: SprinklerTurnback
   firingArc: '360'
-  flashOffset: '4'
+  flashOffset: '5'
   gunTemplateName: scannergun1
   mountAngle: '0'
   mountName: main4
   sfx:
     sound: 'null'
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '10'
+  sprinklerIncrementAngle: '5'
   sprinklerStartAngle: '-90'
   sprinklerTurnbackAngle: '90'
   syncOffset: '0.75'
   syncTo: main
 - fireMode: SprinklerTurnback
   firingArc: '360'
-  flashOffset: '5'
+  flashOffset: '6'
   gunTemplateName: scannergun1
   mountAngle: '0'
   mountName: main5
   sfx:
-    pitch: '0.5'
-    sound: Enemy Laser Loop3
+    sound: 'null'
   slewRate: '0'
   sprinklerFlyback: 'true'
-  sprinklerIncrementAngle: '10'
+  sprinklerIncrementAngle: '5'
   sprinklerStartAngle: '-90'
   sprinklerTurnbackAngle: '90'
   syncOffset: '1'
   syncTo: main
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '3'
+  gunTypeConfig:
+    bulletHue: red
+    bulletPalette: halo
+    bulletPrefab: shurikenBullet
+    bulletSize: '3'
+    burst: '1'
+    cooldown: '5.7'
+    damage: '0.5'
+    lifetime: '0.25'
+    multi: '1'
+    multiSpread: '0'
+    name: hammer
+    rof: '1'
+    speed: '0'
+    spread: '0'
+  mountAngle: '0'
+  mountName: warning
+  sfx:
+    pitch: '4'
+    sound: Enemy spawn rocketpod
+    volume: '0.5'
+  slewRate: '0'
 gunTypes:
-- bulletPrefab: laserBullet
-  bulletSize: '1'
-  burst: '37'
+- bulletPrefab: tracerBullet
+  bulletSize: '2'
+  burst: '74'
   cooldown: '2'
-  damage: '0.4'
+  damage: '0.2'
   effect: Water
   effectAmount: '0.1'
   effectDamage: '0.35'
   effectTime: '0.1'
   lifetime: '0.3'
-  multi: '1'
-  multiSpread: '0'
+  multi: '2'
+  multiSpread: '5'
   name: scannergun1
   rof: '10'
   speed: '2'
   spread: '0'
 healthRegenRate: '0'
diff --git config_181210_2101/Units/68D - Eyeball Dungeon/unit_teslaeye.txt config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeye.txt
index 60f63f8..ba44b4d 100644
--- config_181210_2101/Units/68D - Eyeball Dungeon/unit_teslaeye.txt	
+++ config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeye.txt	
@@ -1,7 +1,7 @@
 art: EnemyTeslaEye
-artScale: '1'
+artScale: '1.5'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 elementSusceptibilityIds:
 - lightningWeakness
@@ -14,30 +14,31 @@ gunMounts:
   gunTemplateName: teslaeyeGun
   mountAngle: '0'
   mountName: main
   slewRate: '0'
 gunTypes:
-- bulletPrefab: ringBullet
-  bulletSize: '1'
+- bulletPrefab: tracerBullet
+  bulletSize: '3'
   burst: '1'
   cooldown: '2'
   damage: '0.2'
   effect: Water
   effectAmount: '0.1'
   effectDamage: '0.15'
   effectTime: '0.1'
-  lifetime: '1.25'
-  multi: '3'
-  multiSpeed: '-2'
+  lifetime: '6'
+  multi: '5'
+  multiLifetime: '-0.1'
+  multiSpeed: '-0.5'
   multiSpread: '0'
   name: teslaeyeGun
   rof: '0.5'
-  speed: '10'
+  speed: '3.5'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
-maxHitPoints: '7'
+maxHitPoints: '30'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: teslaeye
diff --git config_181210_2101/Units/68D - Eyeball Dungeon/unit_teslaeyelaser.txt config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser.txt
index 97e11ed..963c528 100644
--- config_181210_2101/Units/68D - Eyeball Dungeon/unit_teslaeyelaser.txt	
+++ config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser.txt	
@@ -18,14 +18,14 @@ gunMounts:
 gunTypes:
 - bulletPrefab: leisurelyBullet
   bulletSize: '1.5'
   burst: '20'
   cooldown: '0'
-  damage: '0.4'
+  damage: '0.2'
   effect: Water
   effectAmount: '0.1'
-  effectDamage: '0.3'
+  effectDamage: '0.2'
   effectTime: '0.1'
   lifetime: '1'
   name: teslaeyelasermine
   rof: '15'
   speed: '0'
diff --git config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser2.txt config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser2.txt
new file mode 100644
index 0000000..f1cab1b
--- /dev/null
+++ config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser2.txt	
@@ -0,0 +1,28 @@
+art: '!EnemyShivaLaser'
+artScale: '1.625'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '8.9375'
+  gunTemplateName: teslaeyelasermine
+  mountAngle: '0'
+  mountName: main
+  sfx:
+    sound: Enemy Laser Loop6
+  slewRate: '0'
+healthRegenRate: '0'
+isVisibleToAI: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000001'
+maxSpeed: '3'
+maxTurnRate: '360'
+minSpeed: '3'
+spawnInvulnerabilitySeconds: '0'
+templateName: teslaeyelaser2
+tier: '9'
+xpMultiplier: '0'
diff --git config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser3.txt config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser3.txt
new file mode 100644
index 0000000..fcf52a3
--- /dev/null
+++ config_190111_2315/Units/68D - Eyeball Dungeon/unit_teslaeyelaser3.txt	
@@ -0,0 +1,28 @@
+art: '!EnemyShivaLaser'
+artScale: '2.25'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: planeExplosionEmpty
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '0'
+  flashOffset: '12.375'
+  gunTemplateName: teslaeyelasermine
+  mountAngle: '0'
+  mountName: main
+  sfx:
+    sound: Enemy Laser Loop6
+  slewRate: '0'
+healthRegenRate: '0'
+isVisibleToAI: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000001'
+maxSpeed: '3'
+maxTurnRate: '360'
+minSpeed: '3'
+spawnInvulnerabilitySeconds: '0'
+templateName: teslaeyelaser3
+tier: '9'
+xpMultiplier: '0'
diff --git config_181210_2101/Units/72D - Arena Dungeon 1/unit_arenaangel.txt config_190111_2315/Units/72D - Arena Dungeon 1/unit_arenaangel.txt
index dcd55a9..d288361 100644
--- config_181210_2101/Units/72D - Arena Dungeon 1/unit_arenaangel.txt	
+++ config_190111_2315/Units/72D - Arena Dungeon 1/unit_arenaangel.txt	
@@ -9,10 +9,13 @@ gunMounts:
   firingArc: '40'
   flashOffset: '1'
   gunTemplateName: arenaangelGun
   mountAngle: '0'
   mountName: main
+  sfx:
+    pitch: '2'
+    sound: Enemy Shotgun Deadly
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.33'
   gunTemplateName: arenaangelGun2
diff --git config_190111_2315/art_replacements.txt config_190111_2315/art_replacements.txt
new file mode 100644
index 0000000..4fbf85d
--- /dev/null
+++ config_190111_2315/art_replacements.txt
@@ -0,0 +1,37 @@
+assault_EpicA:
+  prefabs:
+    damageCloudFX: damageCloudFXPremium
+duster_EpicA:
+  prefabs:
+    damageCloudFX: damageCloudFXPremium
+engineer_EpicA:
+  prefabs:
+    PlayerEngineerTurret: PlayerEngineerTurretPremium
+hog_EpicA:
+  prefabs:
+    poisonBlastFXDefault: poisonBlastFXPremium
+medic_EpicA:
+  prefabs:
+    healCloudFXDefault: healCloudFXPremium
+olfaithful_EpicA:
+  prefabs:
+    poisonCloudFX: poisonCloudFXPremium
+paladin_EpicA:
+  prefabs:
+    healAuraFX: healAuraFXPremium
+pirate_EpicA:
+  bulletFX:
+    leisurelyBullet: StunnerPremiumFX
+    stunnerBullet: StunnerPremiumFX
+rapier_EpicA:
+  prefabs:
+    RaptorMineExplosion: RaptorMineExplosionPremium
+support_EpicA:
+  prefabs:
+    damageResistAuraFX: damageResistAuraFXPremium
+walker_EpicA:
+  prefabs:
+    damageBlastFXDefault: damageBlastFXPremium
+wizard_EpicA:
+  prefabs:
+    PlaneShieldShort: PlaneShieldShortPremium
diff --git config_181210_2101/cloud_fx.txt config_190111_2315/cloud_fx.txt
index 6e07da7..5debf27 100644
--- config_181210_2101/cloud_fx.txt
+++ config_190111_2315/cloud_fx.txt
@@ -2,37 +2,23 @@ damageAura:
   prefabName: damageAuraFX
 damageAuraFXPremium:
   prefabName: damageAuraFXPremium
 damageBlast:
   prefabName: damageBlastFXDefault
-damageBlastPremium:
-  prefabName: damageBlastFXPremium
 damageCloud:
   prefabName: damageCloudFX
-damageCloudFXPremium:
-  prefabName: damageCloudFXPremium
 damageResistAura:
   prefabName: damageResistAuraFX
-damageResistAuraFXPremium:
-  prefabName: damageResistAuraFXPremium
 healAura:
   prefabName: healAuraFX
-healAuraFXPremium:
-  prefabName: healAuraFXPremium
 healCloud:
   prefabName: healCloudFXDefault
 healCloudFountain:
   prefabName: healCloudFXFountain
-healCloudPremium:
-  prefabName: healCloudFXPremium
 poisonBlast:
   prefabName: poisonBlastFXDefault
-poisonBlastPremium:
-  prefabName: poisonBlastFXPremium
 poisonCloud:
   prefabName: poisonCloudFX
-poisonCloudFXPremium:
-  prefabName: poisonCloudFXPremium
 rechargeCloud:
   prefabName: rechargeCloudFX
 shieldBlast:
   prefabName: shieldBlastFXDefault
diff --git config_181210_2101/clouds.txt config_190111_2315/clouds.txt
index 77e9a30..9cf1e1c 100644
--- config_181210_2101/clouds.txt
+++ config_190111_2315/clouds.txt
@@ -165,10 +165,24 @@ damageboost9:
   growtime: '2'
   initialAlpha: '0.65'
   initialRadius: '0.2'
   layer: HitHuman
   lifetime: '27'
+damageboost_siege0:
+  bufftime: '2'
+  cloudPrefab: damageCloud
+  cooldown: '2'
+  cost: '0'
+  effect: '1.3'
+  fadeoutTime: '2'
+  finalAlpha: '0'
+  finalRadius: '3'
+  growtime: '0.5'
+  initialAlpha: '0.65'
+  initialRadius: '0.2'
+  layer: HitHuman
+  lifetime: '2'
 damageboostblast0:
   bufftime: '4'
   cloudPrefab: damageBlast
   cooldown: '3'
   cost: '40'
@@ -1115,15 +1129,155 @@ resistaura9:
   lifetime: '20.5'
 shieldblast0:
   bufftime: '4'
   cloudPrefab: shieldBlast
   cooldown: '3'
-  cost: '80'
-  effect: '1.5'
+  cost: '50'
+  effect: '1.33'
   fadeoutTime: '0.1'
   finalAlpha: '0'
-  finalRadius: '5'
+  finalRadius: '3.25'
   growtime: '0'
   initialAlpha: '0.65'
-  initialRadius: '5'
+  initialRadius: '3.25'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast1:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.32'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '3.375'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '3.375'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast10:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.18'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '4.5'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '4.5'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast2:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.30'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '3.5'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '3.5'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast3:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.28'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '3.625'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '3.625'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast4:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.27'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '3.75'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '3.75'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast5:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.25'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '3.875'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '3.875'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast6:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.23'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '4'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '4'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast7:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.22'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '4.125'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '4.125'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast8:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.20'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '4.25'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '4.25'
+  layer: HitHuman
+  lifetime: '0.5'
+shieldblast9:
+  bufftime: '4'
+  cloudPrefab: shieldBlast
+  cooldown: '3'
+  cost: '50'
+  effect: '1.19'
+  fadeoutTime: '0.1'
+  finalAlpha: '0'
+  finalRadius: '4.375'
+  growtime: '0'
+  initialAlpha: '0.65'
+  initialRadius: '4.375'
   layer: HitHuman
   lifetime: '0.5'
diff --git config_181210_2101/global.txt config_190111_2315/global.txt
index a597a74..de57408 100644
--- config_181210_2101/global.txt
+++ config_190111_2315/global.txt
@@ -40,10 +40,14 @@ bulletMultipleSpacing: '0.5'
 checkLinkTimeout: '5'
 clientFPS: '60'
 clientNetworkHeartbeatIntervalMs: '6'
 clientOutboundCap: '2000'
 countChildrenForSpawning: 'false'
+daysIntoFutureToShowEvents: '8'
+daysIntoFutureToShowNews: '8'
+daysIntoPastToShowEvents: '0'
+daysIntoPastToShowNews: '7'
 deathCamGifUploadMaxKBytesPerSec: '128'
 debugInfo: 'false'
 debugLogs:
 - isInChat: 'false'
   tag: characterstorage
diff --git config_181210_2101/index.txt config_190111_2315/index.txt
index be39e18..e201def 100644
--- config_181210_2101/index.txt
+++ config_190111_2315/index.txt
@@ -1,6 +1,7 @@
 - allocs
+- art_replacements
 - bullets
 - camera
 - cloud_fx
 - clouds
 - connection
@@ -103,14 +104,16 @@
 - Items/Primary Weapons/laser_basic
 - Items/Primary Weapons/laser_elementals
 - Items/Primary Weapons/laser_ultrarares
 - Items/Primary Weapons/machinegun_basic
 - Items/Primary Weapons/machinegun_elementals
+- Items/Primary Weapons/machinegun_minigun_basic
 - Items/Primary Weapons/machinegun_ultrarares
 - Items/Primary Weapons/shotgun_basic
 - Items/Primary Weapons/shotgun_elementals
 - Items/Primary Weapons/shotgun_ultrarares
+- Items/Primary Weapons/siege_basic
 - Items/Primary Weapons/sniper_basic
 - Items/Primary Weapons/sniper_elementals
 - Items/Primary Weapons/sniper_ultrarares
 - Items/Primary Weapons/strike_basic
 - Items/Primary Weapons/strike_elementals
@@ -258,10 +261,11 @@
 - Units/01 - Beach/GRP1_gruntleader
 - Units/01 - Beach/GRP2_starfighter
 - Units/01 - Beach/GRP2_starfighterleader
 - Units/01 - Beach/GRP3_tieleader2
 - Units/01 - Beach/GRP3_tiewingman
+- Units/01 - Beach/GRP3_tiewingman_big
 - Units/01 - Beach/SLO1_hunter
 - Units/01 - Beach/SLO2_spotter
 - Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_fighter
 - Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_flamer
 - Units/11 - Lowlands (City) - WWI_SteamPunk/BOS1_foxtrot
@@ -317,11 +321,14 @@
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossnumber12
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB01
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB02
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP1_trainB03
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit
+- Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spirit_controller
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader
+- Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller
+- Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP2_spiritleader_controller2
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP3_skull
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP3_wraith
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP4_zombieherder
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostship
 - Units/22 - Midlands (Ruins) - Ghosts_Spooky/GRP5_ghostshipghost1
@@ -361,10 +368,11 @@
 - Units/31 - Highlands (City) - MadScience_Energy/GRP3_hoppertwoleader
 - Units/31 - Highlands (City) - MadScience_Energy/GRP4_broadside
 - Units/31 - Highlands (City) - MadScience_Energy/GRP4_highgnat
 - Units/31 - Highlands (City) - MadScience_Energy/SLO1_angel2
 - Units/31 - Highlands (City) - MadScience_Energy/SLO3_shmupblimp3
+- Units/31 - Highlands (City) - MadScience_Energy/XXX_robotowerlaser
 - Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserker
 - Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerclaw
 - Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerclawlong
 - Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerclawshort
 - Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerDEATH
@@ -453,10 +461,11 @@
 - 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_highmountaingrunt_controller
 - 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
 - Units/51 - HighMountains (City) - Alien_Hologram/GRP2_ninjaleaderballnchain
@@ -610,11 +619,13 @@
 - Units/61D - Ice Dungeon/unit_blizzard2
 - Units/61D - Ice Dungeon/unit_blizzardcore
 - Units/61D - Ice Dungeon/unit_blizzardicicles
 - Units/61D - Ice Dungeon/unit_blizzardicicles2
 - Units/61D - Ice Dungeon/unit_blizzardiciclesmaster
+- Units/61D - Ice Dungeon/unit_blizzardiciclesmaster_noxp
 - Units/61D - Ice Dungeon/unit_frostgiant
+- Units/61D - Ice Dungeon/unit_frostgiant_noxp
 - 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
@@ -677,41 +688,41 @@
 - Units/62D - Fire Dungeon/zzz_prisonescapeeleader
 - Units/63D - Bomb Dungeon/BOS1_bombboss
 - Units/63D - Bomb Dungeon/BOS1_bombbossDEATH
 - Units/63D - Bomb Dungeon/BOS1_bombbossexploder
 - Units/63D - Bomb Dungeon/BOS2_fatblimp
-- Units/63D - Bomb Dungeon/SLO1_bomberjetexploder
+- Units/63D - Bomb Dungeon/GRP1_altar
+- Units/63D - Bomb Dungeon/GRP1_bombguard
 - Units/63D - Bomb Dungeon/SLO1_flakblimp
 - Units/63D - Bomb Dungeon/SLO1_flakblimpbig
 - Units/63D - Bomb Dungeon/SLO1_flakblimpexploder
 - Units/63D - Bomb Dungeon/SLO1_flakblimpexploderstrong
 - Units/63D - Bomb Dungeon/SLO3_bomberjet
-- Units/63D - Bomb Dungeon/unit_altar
+- Units/63D - Bomb Dungeon/SLO3_bomberjetexploder
 - Units/63D - Bomb Dungeon/unit_bombbarrel
 - Units/63D - Bomb Dungeon/unit_bombbarrelboom
-- Units/63D - Bomb Dungeon/unit_bombguard
 - Units/63D - Bomb Dungeon/unit_homingbomb
 - Units/63D - Bomb Dungeon/unit_homingbomblayer
 - Units/63D - Bomb Dungeon/unit_homingbomblayercenter
 - Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewall
 - Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewallstrong
 - Units/63D - Bomb Dungeon/zzz_bombdungeontreasure
 - Units/63D - Bomb Dungeon/zzz_bombdungeontreasureBIG
 - Units/63D - Bomb Dungeon/zzz_bombdungeontreasureBIG_reward
 - Units/64D - Obstacle Dungeon/BOS1_turbineking
 - Units/64D - Obstacle Dungeon/BOS1_turbinekingDEATH
 - Units/64D - Obstacle Dungeon/BOS2_wavemaster
+- Units/64D - Obstacle Dungeon/BOS2_wavemasterminion
 - Units/64D - Obstacle Dungeon/SLO_fathunter
 - Units/64D - Obstacle Dungeon/SLO_fathuntermini
 - Units/64D - Obstacle Dungeon/SLO_giantgate
 - Units/64D - Obstacle Dungeon/SLO_mazedrawer
 - Units/64D - Obstacle Dungeon/SLO_shockwaver
 - Units/64D - Obstacle Dungeon/SLO_turbine
 - Units/64D - Obstacle Dungeon/SLO_wavemaker
 - Units/64D - Obstacle Dungeon/SLO_wavemakerNW
 - Units/64D - Obstacle Dungeon/SLO_wavemakerSW
-- Units/64D - Obstacle Dungeon/SLO_wavemasterminion
 - Units/64D - Obstacle Dungeon/unit_buzzard
 - Units/64D - Obstacle Dungeon/zzz_obstacledungeondestroyablewall
 - Units/64D - Obstacle Dungeon/zzz_obstacledungeondestroyablewallstrong
 - Units/64D - Obstacle Dungeon/zzz_obstacledungeontreasure
 - Units/64D - Obstacle Dungeon/zzz_obstacledungeontreasureBIG
@@ -746,10 +757,11 @@
 - Units/65D - Grindhouse Dungeon/unit_spiralmaster
 - Units/65D - Grindhouse Dungeon/unit_spiralmasterjr
 - Units/65D - Grindhouse Dungeon/unit_teslaclone
 - Units/65D - Grindhouse Dungeon/unit_teslaclonelaser
 - Units/65D - Grindhouse Dungeon/unit_zombiehatcher
+- Units/65D - Grindhouse Dungeon/unit_zombieshatcherzombie
 - 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
@@ -861,10 +873,12 @@
 - Units/68D - Eyeball Dungeon/unit_popper2
 - Units/68D - Eyeball Dungeon/unit_poppermini
 - Units/68D - Eyeball Dungeon/unit_scanner
 - Units/68D - Eyeball Dungeon/unit_teslaeye
 - Units/68D - Eyeball Dungeon/unit_teslaeyelaser
+- Units/68D - Eyeball Dungeon/unit_teslaeyelaser2
+- Units/68D - Eyeball Dungeon/unit_teslaeyelaser3
 - Units/68D - Eyeball Dungeon/unit_triguard
 - Units/68D - Eyeball Dungeon/unit_triguardleader
 - Units/68D - Eyeball Dungeon/unit_warper
 - Units/68D - Eyeball Dungeon/zzz_eyedungeondestroyablewall
 - Units/68D - Eyeball Dungeon/zzz_eyedungeondestroyablewallstrong
diff --git config_181210_2101/instantEffects.txt config_190111_2315/instantEffects.txt
index 04bcfc3..e82987e 100644
--- config_181210_2101/instantEffects.txt
+++ config_190111_2315/instantEffects.txt
@@ -822,10 +822,14 @@ enemyChargeShot:
   - prefab: enemyChargeShot
     time: '0'
   - sfx:
       sound: Drop cloud
     time: '0.1'
+enemyChargeShot2:
+  steps:
+  - prefab: enemyChargeShot
+    time: '0'
 enemyClockGong:
   steps:
   - sfx:
       pitch: '0.75'
       sound: Enemy Clock Gong
@@ -1387,10 +1391,14 @@ explosionSmallMuted:
       - '0'
       - '0'
       - '0'
     prefab: ExplosionSmall
     time: '0.00'
+flakShortShield:
+  steps:
+  - doesFollowUnit: 'false'
+    prefab: PlaneShieldShort
 maneuver180:
   steps:
   - sfx:
       sound: 180 maneuver
 maneuverBarrelRoll:
diff --git config_181210_2101/islandQuestEnemies.txt config_190111_2315/islandQuestEnemies.txt
index aeecf06..a222ed9 100644
--- config_181210_2101/islandQuestEnemies.txt
+++ config_190111_2315/islandQuestEnemies.txt
@@ -52,10 +52,14 @@ kaiju:
   minlevel: '20'
 kraken:
   maxdistance: '800'
   maxlevel: '99'
   minlevel: '12'
+meowza:
+  maxdistance: '400'
+  maxlevel: '99'
+  minlevel: '0'
 navileader:
   maxdistance: '150'
   maxlevel: '8'
   minlevel: '2'
 notra:
diff --git config_181210_2101/maneuvers.txt config_190111_2315/maneuvers.txt
index 9be7ea4..24cbd8c 100644
--- config_181210_2101/maneuvers.txt
+++ config_190111_2315/maneuvers.txt
@@ -54,12 +54,24 @@
 - cooldown: '0.2'
   energy: '30'
   name: shortShield
   scale: '8'
   secondsToVelocity1: '0.2'
+- cooldown: '0.2'
+  distance: '1'
+  energy: '30'
+  name: flak
+  scale: '4'
+  secondsToVelocity1: '0.2'
+- doesNotSpamOnKeepingPressed: 'true'
+  duration: '1.5'
+  duration2: '0.8'
+  energy: '1'
+  energySustained: '5'
+  name: siege
 - deceleration: '50'
-  energy: '15'
+  energy: '18'
   name: invincibleDash
   secondsToVelocity1: '0.13'
   target1Speed: '10'
 - acceleration: '6'
   deceleration: '8'
diff --git config_181210_2101/news.txt config_190111_2315/news.txt
index a9bfddf..ab99b84 100644
--- config_181210_2101/news.txt
+++ config_190111_2315/news.txt
@@ -24,8 +24,12 @@ news_fledgling_flamingo:
   Url: https://community.steambirds.com/blog/338
 news_goslings_gravely:
   IsVisibleToClient: 'true'
   Time: 2018-11-28 00:00
   Url: https://community.steambirds.com/blog/339
+news_hardy_heron:
+  IsVisibleToClient: 'true'
+  Time: 2018-12-12 17:00
+  Url: https://community.steambirds.com/blog/340
 test_news:
   IsVisibleToClient: 'false'
   Time: 2018-05-31 00:00
diff --git config_181210_2101/playerclasses.txt config_190111_2315/playerclasses.txt
index 02a7eba..2c249b3 100644
--- config_181210_2101/playerclasses.txt
+++ config_190111_2315/playerclasses.txt
@@ -182,61 +182,149 @@ assault:
     hideIfLocked: 'true'
     id: Camo
     livery: camo.assault
     prefab: PlayerAssaultVariantB
     unlockItemId: playerclass_assault_camo
-  - cloudOverride: damageCloudFXPremium
+  - artReplacement: assault_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.assault
     prefab: PlayerAssaultVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_assault_epica
-  - cloudOverride: damageCloudFXPremium
+  - artReplacement: assault_EpicA
     extraColor1: 0a5fa7
     extraColor2: d2cdb8
     extraColor3: 3be5d3
     hideIfLocked: 'true'
     id: EpicB
     livery: gradient.assault
     prefab: PlayerAssaultVariantA
     superTrail: SuperSpeedWaterWake
     unlockItemId: playerclass_assault_epicb
-  - cloudOverride: damageCloudFXPremium
+  - artReplacement: assault_EpicA
     extraColor1: 1e062b
     extraColor2: f9962c
     extraColor3: 5b157d
     hideIfLocked: 'true'
     id: EpicC
     livery: tigerstripes.assault
     prefab: PlayerAssaultVariantB
     superTrail: SuperSpeedGlitter
     unlockItemId: playerclass_assault_epicc
-  - cloudOverride: damageCloudFXPremium
+  - artReplacement: assault_EpicA
     extraColor1: 620a1a
     extraColor2: da3420
     extraColor3: d6ccbc
     hideIfLocked: 'true'
     id: EpicD
     livery: checker.assault
     prefab: PlayerAssault
     superTrail: SuperSpeedJaggies
     unlockItemId: playerclass_assault_epicd
+bigbird:
+  actions:
+    Engine:
+    - maneuver: superspeed
+    - buff:
+      - amount: '3'
+        math: multiply
+        name: maxSpeed
+    MainGun:
+    - buff:
+      - amount: '0.3'
+        math: multiply
+        name: maxTurnRate
+      - amount: '0.1'
+        math: multiply
+        name: minSpeed
+      - amount: '0.1'
+        math: multiply
+        name: maxSpeed
+  additionalTutorial: DungeonTutorialWalker2
+  allowedItemTags:
+  - machinegun_minigun
+  - healaura
+  basicTutorial: DungeonTutorialWalker
+  damageMultiplierWhenNotSuperspeeding: '2.0'
+  damageMultiplierWhenSuperspeeding: '0.1'
+  defaultUpgradeCap: '25'
+  maneuver: invincibleDash
+  name: Big Bird
+  planeName: walkerClassPlane
+  portrait: classBlueprint_daggerknight
+  preRelease: 'true'
+  sortKey: '110'
+  startingItems:
+  - item: machinegun_minigun_0
+    slot: MainGun
+  - item: engine_0
+    slot: Engine
+  - item: healaura_0
+    slot: SecondaryAttack
+  - item: armor_0
+    slot: Armor
+  statMods:
+  - amount: '1.0'
+    math: multiply
+    name: gunDamageMod
+  - amount: '1.5'
+    math: multiply
+    name: energyRegenRate
+  - amount: '1.0'
+    math: multiply
+    name: maxHitPoints
+  - amount: '1.024'
+    leveling: 'true'
+    math: multiply
+    name: maxHitPoints
+  - amount: '1.04'
+    leveling: 'true'
+    math: multiply
+    name: gunDamageMod
+  - amount: '0.33'
+    math: multiply
+    name: minSpeed
+  - amount: '0.33'
+    math: multiply
+    name: maxSpeed
+  totalUpgradeCap: '400'
+  unlockItemId: playerclass_daggerknight
+  upgradeCaps:
+  - cap: '50'
+    statName: maxHitPoints
+  - cap: '50'
+    statName: maxTurnRate
+  - cap: '40'
+    statName: gunDamageMod
+  - cap: '10'
+    statName: maxEnergyPoints
+  - cap: '60'
+    statName: healthRegenRate
+  - cap: '40'
+    statName: energyRegenRate
+  - cap: '60'
+    statName: maxSpeed
+  - cap: '50'
+    statName: minSpeed
+  variants:
+  - id: default
+    prefab: PlayerRaptor
 daggerknight:
   additionalTutorial: DungeonTutorialWalker2
   allowedItemTags:
   - sniper
+  - shield_blast
   basicTutorial: DungeonTutorialWalker
   defaultUpgradeCap: '25'
   maneuver: invincibleDash
   name: Dagger Knight
   planeName: walkerClassPlane
   portrait: classBlueprint_daggerknight
-  preRelease: 'true'
   sortKey: '110'
   startingItems:
   - item: sniper_0
     slot: MainGun
   - item: engine_0
@@ -247,11 +335,11 @@ daggerknight:
     slot: Armor
   statMods:
   - amount: '0.8'
     math: multiply
     name: maxHitPoints
-  - amount: '1'
+  - amount: '0.75'
     math: multiply
     name: gunDamageMod
   - amount: '0.8'
     math: multiply
     name: gunRangeMod
@@ -283,10 +371,102 @@ daggerknight:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerDaggerKnight
+  - extraColor1: 0a3984
+    extraColor2: '060507'
+    extraColor3: b9b5a3
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.daggerknight
+    prefab: PlayerDaggerKnight
+    unlockItemId: playerclass_daggerknight_flames
+  - extraColor1: 2a043d
+    extraColor2: d50099
+    extraColor3: d50099
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.daggerknight
+    prefab: PlayerDaggerKnight
+    unlockItemId: playerclass_daggerknight_spikes
+  - extraColor1: 28660e
+    extraColor2: b9b5a3
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.daggerknight
+    prefab: PlayerDaggerKnight
+    unlockItemId: playerclass_daggerknight_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.daggerknight
+    prefab: PlayerDaggerKnight
+    unlockItemId: playerclass_daggerknight_tiger
+  - extraColor1: b9b5a3
+    extraColor2: 1db2c7
+    extraColor3: 1db2c7
+    hideIfLocked: 'true'
+    id: VariantA
+    livery: stripes.daggerknight
+    prefab: PlayerDaggerKnightVariantA
+    unlockItemId: playerclass_daggerknight_varianta
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: VariantB
+    livery: caution.daggerknight
+    prefab: PlayerDaggerKnightVariantB
+    unlockItemId: playerclass_daggerknight_variantb
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.daggerknight
+    prefab: PlayerDaggerKnightVariantB
+    unlockItemId: playerclass_daggerknight_camo
+  - extraColor1: cfe3de
+    extraColor2: 95a8a2
+    extraColor3: 5f6a66
+    hideIfLocked: 'true'
+    id: EpicA
+    livery: camo.daggerknight
+    prefab: PlayerDaggerKnightVariantA
+    superTrail: SuperSpeedLightning
+    unlockItemId: playerclass_daggerknight_epica
+  - extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.daggerknight
+    prefab: PlayerDaggerKnight
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_daggerknight_epicb
+  - extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.daggerknight
+    prefab: PlayerDaggerKnightVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_daggerknight_epicc
+  - extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.daggerknight
+    prefab: PlayerDaggerKnightVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_daggerknight_epicd
 duster:
   actions:
     Armor:
     - maneuver: himmelman
     Engine:
@@ -459,10 +639,18 @@ duster:
     hideIfLocked: 'true'
     id: stars
     livery: stars.duster
     prefab: PlayerDuster
     unlockItemId: playerclass_duster_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.duster
+    prefab: PlayerDuster
+    unlockItemId: playerclass_duster_tiger
   - extraColor1: 2e2d27
     extraColor2: dba525
     extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantA
@@ -475,20 +663,58 @@ duster:
     hideIfLocked: 'true'
     id: VariantB
     livery: stripes.duster
     prefab: PlayerDusterVariantB
     unlockItemId: playerclass_duster_variantb
-  - cloudOverride: damageCloudFXPremium
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.duster
+    prefab: PlayerDusterVariantA
+    unlockItemId: playerclass_duster_camo
+  - artReplacement: duster_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.duster
     prefab: PlayerDusterVariantB
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_duster_epica
+  - artReplacement: duster_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.duster
+    prefab: PlayerDuster
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_duster_epicb
+  - artReplacement: duster_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.duster
+    prefab: PlayerDusterVariantB
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_duster_epicc
+  - artReplacement: duster_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.duster
+    prefab: PlayerDusterVariantA
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_duster_epicd
 engineer:
   actions:
     Armor:
     - maneuver: himmelman
     Engine:
@@ -575,10 +801,18 @@ engineer:
     hideIfLocked: 'true'
     id: stars
     livery: stars.engineer
     prefab: PlayerEngineer
     unlockItemId: playerclass_engineer_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.engineer
+    prefab: PlayerEngineer
+    unlockItemId: playerclass_engineer_tiger
   - extraColor1: b9b5a3
     extraColor2: dba525
     extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantA
@@ -591,19 +825,55 @@ engineer:
     hideIfLocked: 'true'
     id: VariantB
     livery: caution.engineer
     prefab: PlayerEngineerVariantB
     unlockItemId: playerclass_engineer_variantb
-  - extraColor1: cfe3de
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.engineer
+    prefab: PlayerEngineerVariantB
+    unlockItemId: playerclass_engineer_camo
+  - artReplacement: engineer_EpicA
+    extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.engineer
     prefab: PlayerEngineerVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_engineer_epica
+  - extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.engineer
+    prefab: PlayerEngineer
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_engineer_epicb
+  - extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.engineer
+    prefab: PlayerEngineerVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_engineer_epicc
+  - extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.engineer
+    prefab: PlayerEngineerVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_engineer_epicd
 medic:
   additionalTutorial: DungeonTutorial2
   allowedItemTags:
   - triple
   - wasp
@@ -718,41 +988,41 @@ medic:
     hideIfLocked: 'true'
     id: Camo
     livery: camo.medic
     prefab: PlayerMedicVariantB
     unlockItemId: playerclass_medic_camo
-  - cloudOverride: healCloudPremium
+  - artReplacement: medic_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.medic
     prefab: PlayerMedicVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_medic_epica
-  - cloudOverride: healCloudPremium
+  - artReplacement: medic_EpicA
     extraColor1: 0a5fa7
     extraColor2: d2cdb8
     extraColor3: 3be5d3
     hideIfLocked: 'true'
     id: EpicB
     livery: gradient.medic
     prefab: PlayerMedicVariantA
     superTrail: SuperSpeedWaterWake
     unlockItemId: playerclass_medic_epicb
-  - cloudOverride: healCloudPremium
+  - artReplacement: medic_EpicA
     extraColor1: 1e062b
     extraColor2: f9962c
     extraColor3: 5b157d
     hideIfLocked: 'true'
     id: EpicC
     livery: tigerstripes.medic
     prefab: PlayerMedic
     superTrail: SuperSpeedGlitter
     unlockItemId: playerclass_medic_epicc
-  - cloudOverride: healCloudPremium
+  - artReplacement: medic_EpicA
     extraColor1: 620a1a
     extraColor2: da3420
     extraColor3: d6ccbc
     hideIfLocked: 'true'
     id: EpicD
@@ -877,41 +1147,41 @@ olfaithful:
     hideIfLocked: 'true'
     id: Camo
     livery: camo.oldfaithful
     prefab: PlayerOldFaithfulVariantA
     unlockItemId: playerclass_oldfaithful_camo
-  - cloudOverride: poisonCloudFXPremium
+  - artReplacement: olfaithful_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.oldfaithful
     prefab: PlayerOldFaithfulVariantB
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_oldfaithful_epica
-  - cloudOverride: poisonCloudFXPremium
+  - artReplacement: olfaithful_EpicA
     extraColor1: 0a5fa7
     extraColor2: d2cdb8
     extraColor3: 3be5d3
     hideIfLocked: 'true'
     id: EpicB
     livery: gradient.oldfaithful
     prefab: PlayerOldFaithful
     superTrail: SuperSpeedWaterWake
     unlockItemId: playerclass_oldfaithful_epicb
-  - cloudOverride: poisonCloudFXPremium
+  - artReplacement: olfaithful_EpicA
     extraColor1: 1e062b
     extraColor2: f9962c
     extraColor3: 5b157d
     hideIfLocked: 'true'
     id: EpicC
     livery: tigerstripes.oldfaithful
     prefab: PlayerOldFaithfulVariantB
     superTrail: SuperSpeedGlitter
     unlockItemId: playerclass_oldfaithful_epicc
-  - cloudOverride: poisonCloudFXPremium
+  - artReplacement: olfaithful_EpicA
     extraColor1: 620a1a
     extraColor2: da3420
     extraColor3: d6ccbc
     hideIfLocked: 'true'
     id: EpicD
@@ -1004,10 +1274,18 @@ paladin:
     hideIfLocked: 'true'
     id: stars
     livery: stars.paladin
     prefab: PlayerPaladin
     unlockItemId: playerclass_paladin_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.paladin
+    prefab: PlayerPaladin
+    unlockItemId: playerclass_paladin_tiger
   - extraColor1: b9b5a3
     extraColor2: ad10db
     extraColor3: ad10db
     hideIfLocked: 'true'
     id: VariantA
@@ -1020,20 +1298,58 @@ paladin:
     hideIfLocked: 'true'
     id: VariantB
     livery: caution.paladin
     prefab: PlayerPaladinVariantB
     unlockItemId: playerclass_paladin_variantb
-  - cloudOverride: healAuraFXPremium
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.paladin
+    prefab: PlayerPaladinVariantB
+    unlockItemId: playerclass_paladin_camo
+  - artReplacement: paladin_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.paladin
-    prefab: PlayerPaladinVariantB
+    prefab: PlayerPaladinVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_paladin_epica
+  - artReplacement: paladin_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.paladin
+    prefab: PlayerPaladin
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_paladin_epicb
+  - artReplacement: paladin_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.paladin
+    prefab: PlayerPaladinVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_paladin_epicc
+  - artReplacement: paladin_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.paladin
+    prefab: PlayerPaladinVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_paladin_epicd
 pirate:
   actions:
     Armor:
     - maneuver: warpForward
     Engine:
@@ -1119,10 +1435,18 @@ pirate:
     hideIfLocked: 'true'
     id: stars
     livery: stars.bandit
     prefab: PlayerBandit
     unlockItemId: playerclass_bandit_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.bandit
+    prefab: PlayerBandit
+    unlockItemId: playerclass_bandit_tiger
   - extraColor1: b9b5a3
     extraColor2: 1477e5
     extraColor3: 1477e5
     hideIfLocked: 'true'
     id: VariantA
@@ -1135,19 +1459,58 @@ pirate:
     hideIfLocked: 'true'
     id: VariantB
     livery: caution.bandit
     prefab: PlayerBanditVariantB
     unlockItemId: playerclass_bandit_variantb
-  - extraColor1: cfe3de
-    extraColor2: 95a8a2
-    extraColor3: 5f6a66
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
     hideIfLocked: 'true'
-    id: EpicA
+    id: Camo
     livery: camo.bandit
     prefab: PlayerBanditVariantB
+    unlockItemId: playerclass_bandit_camo
+  - artReplacement: pirate_EpicA
+    extraColor1: cfe3de
+    extraColor2: 95a8a2
+    extraColor3: 5f6a66
+    hideIfLocked: 'true'
+    id: EpicA
+    livery: camo.bandit
+    prefab: PlayerBanditVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_bandit_epica
+  - artReplacement: pirate_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.bandit
+    prefab: PlayerBandit
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_bandit_epicb
+  - artReplacement: pirate_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.bandit
+    prefab: PlayerBanditVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_bandit_epicc
+  - artReplacement: pirate_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.bandit
+    prefab: PlayerBanditVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_bandit_epicd
 rapier:
   actions:
     MainGun:
     - buff:
       - amount: '0.3'
@@ -1248,10 +1611,18 @@ rapier:
     hideIfLocked: 'true'
     id: stars
     livery: stars.raptor
     prefab: PlayerRaptor
     unlockItemId: playerclass_raptor_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.raptor
+    prefab: PlayerRaptor
+    unlockItemId: playerclass_raptor_tiger
   - extraColor1: 2e2d27
     extraColor2: dba525
     extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantA
@@ -1264,19 +1635,217 @@ rapier:
     hideIfLocked: 'true'
     id: VariantB
     livery: stripes.raptor
     prefab: PlayerRaptorVariantB
     unlockItemId: playerclass_raptor_variantb
-  - extraColor1: cfe3de
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.raptor
+    prefab: PlayerRaptorVariantA
+    unlockItemId: playerclass_raptor_camo
+  - artReplacement: rapier_EpicA
+    extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.raptor
     prefab: PlayerRaptorVariantB
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_raptor_epica
+  - artReplacement: rapier_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.raptor
+    prefab: PlayerRaptor
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_raptor_epicb
+  - artReplacement: rapier_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.raptor
+    prefab: PlayerRaptorVariantB
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_raptor_epicc
+  - artReplacement: rapier_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.raptor
+    prefab: PlayerRaptorVariantA
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_raptor_epicd
+siegetank:
+  additionalTutorial: DungeonTutorialWalker2
+  aimSecondaryRange: '2.6'
+  allowedItemTags:
+  - laser
+  - flak
+  basicTutorial: DungeonTutorialWalker
+  defaultUpgradeCap: '25'
+  maneuver: siege
+  name: Siege Tank
+  permanentActionsBasedOnItems:
+    ManeuverGun:
+    - id: siege_permanent_0
+      maneuverState: Siege
+      type: Always
+  planeName: walkerClassPlane
+  portrait: classBlueprint_siegetank
+  sortKey: '110'
+  startingItems:
+  - item: laser_0
+    slot: MainGun
+  - item: engine_0
+    slot: Engine
+  - item: flak_0
+    slot: SecondaryAttack
+  - item: armor_0
+    slot: Armor
+  statMods:
+  - amount: '0.8'
+    math: multiply
+    name: maxHitPoints
+  - amount: '0.75'
+    math: multiply
+    name: gunDamageMod
+  - amount: '0.8'
+    math: multiply
+    name: gunRangeMod
+  - amount: '1.024'
+    leveling: 'true'
+    math: multiply
+    name: maxHitPoints
+  - amount: '1.04'
+    leveling: 'true'
+    math: multiply
+    name: gunDamageMod
+  totalUpgradeCap: '400'
+  unlockItemId: playerclass_siegetank
+  upgradeCaps:
+  - cap: '50'
+    statName: maxHitPoints
+  - cap: '50'
+    statName: maxTurnRate
+  - cap: '40'
+    statName: gunDamageMod
+  - cap: '10'
+    statName: maxEnergyPoints
+  - cap: '60'
+    statName: healthRegenRate
+  - cap: '40'
+    statName: energyRegenRate
+  - cap: '60'
+    statName: maxSpeed
+  - cap: '50'
+    statName: minSpeed
+  variants:
+  - id: default
+    prefab: PlayerSiegeTank
+  - extraColor1: 0e5765
+    extraColor2: dba525
+    extraColor3: dd560d
+    hideIfLocked: 'true'
+    id: flames
+    livery: flames.siegetank
+    prefab: PlayerSiegeTank
+    unlockItemId: playerclass_siegetank_flames
+  - extraColor1: 0e5765
+    extraColor2: 072c33
+    extraColor3: 55c91d
+    hideIfLocked: 'true'
+    id: spikes
+    livery: spikes.siegetank
+    prefab: PlayerSiegeTank
+    unlockItemId: playerclass_siegetank_spikes
+  - extraColor1: da3420
+    extraColor2: '060507'
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: stars
+    livery: stars.siegetank
+    prefab: PlayerSiegeTank
+    unlockItemId: playerclass_siegetank_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.siegetank
+    prefab: PlayerSiegeTank
+    unlockItemId: playerclass_siegetank_tiger
+  - extraColor1: 2e2d27
+    extraColor2: dba525
+    extraColor3: dba525
+    hideIfLocked: 'true'
+    id: VariantA
+    livery: caution.siegetank
+    prefab: PlayerSiegeTankVariantA
+    unlockItemId: playerclass_siegetank_varianta
+  - extraColor1: b9b5a3
+    extraColor2: 1477e5
+    extraColor3: 1477e5
+    hideIfLocked: 'true'
+    id: VariantB
+    livery: stripes.siegetank
+    prefab: PlayerSiegeTankVariantB
+    unlockItemId: playerclass_siegetank_variantb
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.siegetank
+    prefab: PlayerSiegeTankVariantB
+    unlockItemId: playerclass_siegetank_camo
+  - extraColor1: cfe3de
+    extraColor2: 95a8a2
+    extraColor3: 5f6a66
+    hideIfLocked: 'true'
+    id: EpicA
+    livery: camo.siegetank
+    prefab: PlayerSiegeTankVariantA
+    superTrail: SuperSpeedLightning
+    unlockItemId: playerclass_siegetank_epica
+  - extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.siegetank
+    prefab: PlayerSiegeTank
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_siegetank_epicb
+  - extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.siegetank
+    prefab: PlayerSiegeTankVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_siegetank_epicc
+  - extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.siegetank
+    prefab: PlayerSiegeTankVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_siegetank_epicd
 support:
   actions:
     Armor:
     - maneuver: dash
     Engine:
@@ -1365,10 +1934,18 @@ support:
     hideIfLocked: 'true'
     id: stars
     livery: stars.shieldmaiden
     prefab: PlayerShieldMaiden
     unlockItemId: playerclass_shieldmaiden_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.shieldmaiden
+    prefab: PlayerShieldMaiden
+    unlockItemId: playerclass_shieldmaiden_tiger
   - extraColor1: 2e2d27
     extraColor2: dba525
     extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantA
@@ -1381,20 +1958,58 @@ support:
     hideIfLocked: 'true'
     id: VariantB
     livery: stripes.shieldmaiden
     prefab: PlayerShieldMaidenVariantB
     unlockItemId: playerclass_shieldmaiden_variantb
-  - cloudOverride: damageResistAuraFXPremium
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.shieldmaiden
+    prefab: PlayerShieldaidenVariantB
+    unlockItemId: playerclass_shieldmaiden_camo
+  - artReplacement: support_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.shieldmaiden
     prefab: PlayerShieldMaidenVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_shieldmaiden_epica
+  - artReplacement: support_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.shieldmaiden
+    prefab: PlayerShieldMaiden
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_shieldmaiden_epicb
+  - artReplacement: support_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.shieldmaiden
+    prefab: PlayerShieldMaidenVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_shieldmaiden_epicc
+  - artReplacement: support_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.shieldmaiden
+    prefab: PlayerShieldMaidenVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_shieldmaiden_epicd
 tank:
   additionalTutorial: DungeonTutorial2
   allowedItemTags:
   - machinegun
   - poison_blast
@@ -1476,10 +2091,18 @@ tank:
     hideIfLocked: 'true'
     id: stars
     livery: stars.hog
     prefab: PlayerHog
     unlockItemId: playerclass_hog_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.hog
+    prefab: PlayerHog
+    unlockItemId: playerclass_hog_tiger
   - extraColor1: 2e2d27
     extraColor2: dba525
     extraColor3: dba525
     hideIfLocked: 'true'
     id: VariantA
@@ -1492,20 +2115,58 @@ tank:
     hideIfLocked: 'true'
     id: VariantB
     livery: stripes.hog
     prefab: PlayerHog
     unlockItemId: playerclass_hog_variantb
-  - cloudOverride: poisonBlastPremium
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.hog
+    prefab: PlayerHogVariantA
+    unlockItemId: playerclass_hog_camo
+  - artReplacement: hog_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.hog
     prefab: PlayerHogVariantB
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_hog_epica
+  - artReplacement: hog_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.hog
+    prefab: PlayerHog
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_hog_epicb
+  - artReplacement: hog_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.hog
+    prefab: PlayerHogVariantB
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_hog_epicc
+  - artReplacement: hog_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.hog
+    prefab: PlayerHogVariantA
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_hog_epicd
 walker:
   additionalTutorial: DungeonTutorialWalker2
   allowedItemTags:
   - machinegun
   - damageboost_blast
@@ -1563,34 +2224,42 @@ walker:
   - cap: '50'
     statName: minSpeed
   variants:
   - id: default
     prefab: PlayerWalker
-  - extraColor1: 2a043d
+  - extraColor1: 1db2c7
     extraColor2: b9b5a3
-    extraColor3: da3420
+    extraColor3: d50099
     hideIfLocked: 'true'
     id: flames
     livery: flames.walker
     prefab: PlayerWalker
     unlockItemId: playerclass_walker_flames
   - extraColor1: '117054'
     extraColor2: 95bb0f
     extraColor3: 95bb0f
     hideIfLocked: 'true'
     id: spikes
     livery: spikes.walker
     prefab: PlayerWalker
     unlockItemId: playerclass_walker_spikes
-  - extraColor1: d50099
-    extraColor2: 3a0025
-    extraColor3: e6e3d3
+  - extraColor1: b9b5a3
+    extraColor2: 072c33
+    extraColor3: 1db2c7
     hideIfLocked: 'true'
     id: stars
     livery: stars.walker
     prefab: PlayerWalker
     unlockItemId: playerclass_walker_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.walker
+    prefab: PlayerWalker
+    unlockItemId: playerclass_walker_tiger
   - extraColor1: b9b5a3
     extraColor2: c31536
     extraColor3: c31536
     hideIfLocked: 'true'
     id: VariantA
@@ -1603,20 +2272,58 @@ walker:
     hideIfLocked: 'true'
     id: VariantB
     livery: caution.walker
     prefab: PlayerWalkerVariantB
     unlockItemId: playerclass_walker_variantb
-  - cloudOverride: damageBlastPremium
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.walker
+    prefab: PlayerWalkerVariantB
+    unlockItemId: playerclass_walker_camo
+  - artReplacement: walker_EpicA
     extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.walker
     prefab: PlayerWalkerVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_walker_epica
+  - artReplacement: walker_EpicA
+    extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.walker
+    prefab: PlayerWalker
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_walker_epicb
+  - artReplacement: walker_EpicA
+    extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.walker
+    prefab: PlayerWalkerVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_walker_epicc
+  - artReplacement: walker_EpicA
+    extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.walker
+    prefab: PlayerWalkerVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_walker_epicd
 wizard:
   actions:
     Armor:
     - maneuver: warpForward
     Engine:
@@ -1713,10 +2420,18 @@ wizard:
     hideIfLocked: 'true'
     id: stars
     livery: stars.merlin
     prefab: PlayerMerlin
     unlockItemId: playerclass_merlin_stars
+  - extraColor1: dd560d
+    extraColor2: b9b5a3
+    extraColor3: 1a0f1f
+    hideIfLocked: 'true'
+    id: Tiger
+    livery: tigerstripes.merlin
+    prefab: PlayerMerlin
+    unlockItemId: playerclass_merlin_tiger
   - extraColor1: b9b5a3
     extraColor2: d50099
     extraColor3: d50099
     hideIfLocked: 'true'
     id: VariantA
@@ -1729,14 +2444,50 @@ wizard:
     hideIfLocked: 'true'
     id: VariantB
     livery: caution.merlin
     prefab: PlayerMerlinVariantB
     unlockItemId: playerclass_merlin_variantb
-  - extraColor1: cfe3de
+  - extraColor1: '556913'
+    extraColor2: 1e2507
+    extraColor3: 3c2408
+    hideIfLocked: 'true'
+    id: Camo
+    livery: camo.merlin
+    prefab: PlayerMerlinVariantB
+    unlockItemId: playerclass_merlin_camo
+  - artReplacement: wizard_EpicA
+    extraColor1: cfe3de
     extraColor2: 95a8a2
     extraColor3: 5f6a66
     hideIfLocked: 'true'
     id: EpicA
     livery: camo.merlin
     prefab: PlayerMerlinVariantA
     superTrail: SuperSpeedLightning
     unlockItemId: playerclass_merlin_epica
+  - extraColor1: 0a5fa7
+    extraColor2: d2cdb8
+    extraColor3: 3be5d3
+    hideIfLocked: 'true'
+    id: EpicB
+    livery: gradient.merlin
+    prefab: PlayerMerlin
+    superTrail: SuperSpeedWaterWake
+    unlockItemId: playerclass_merlin_epicb
+  - extraColor1: 1e062b
+    extraColor2: f9962c
+    extraColor3: 5b157d
+    hideIfLocked: 'true'
+    id: EpicC
+    livery: tigerstripes.merlin
+    prefab: PlayerMerlinVariantA
+    superTrail: SuperSpeedGlitter
+    unlockItemId: playerclass_merlin_epicc
+  - extraColor1: 620a1a
+    extraColor2: da3420
+    extraColor3: d6ccbc
+    hideIfLocked: 'true'
+    id: EpicD
+    livery: checker.merlin
+    prefab: PlayerMerlinVariantB
+    superTrail: SuperSpeedJaggies
+    unlockItemId: playerclass_merlin_epicd
diff --git config_181210_2101/questGivers.txt config_190111_2315/questGivers.txt
index e8a4051..44d1921 100644
--- config_181210_2101/questGivers.txt
+++ config_190111_2315/questGivers.txt
@@ -266,11 +266,12 @@
       genCount: '1'
       maxDuration: 01.00:00:00.00
       quests:
       - id: dailyreward_Wednesday
       schedule: 0 0 * * 3
-- completeGuidanceTargets:
+- categorize: 'true'
+  completeGuidanceTargets:
   - crafter
   - portal_Nexus
   id: crafter
   location: nexus
   permanentQuests:
@@ -427,6 +428,7 @@
   - id: craft_armor_8
   - id: craft_engine_speed_8
   - id: craft_engine_destruction_8
   - id: craft_engine_power_8
   - id: craft_engine_repair_8
+  showDescriptions: 'false'
   sortAcquiredAboveOther: 'true'
diff --git config_181210_2101/quick_chat.txt config_190111_2315/quick_chat.txt
index 5e22d0c..e3f843e 100644
--- config_181210_2101/quick_chat.txt
+++ config_190111_2315/quick_chat.txt
@@ -39,10 +39,14 @@ D:
   isInUILayer: 'false'
   leakyBucketInterval: '3'
   leakyBucketMax: '3'
   text_key: quick_chat_whee
   text_key_empty: quick_chat_whee
+DeathWreath:
+  isInUILayer: 'false'
+  prefabName: QuickChat_DeathWreath
+  unlock_item_id: emote_deathwreath
 Disco:
   hidden: 'false'
   isInUILayer: 'false'
   prefabName: QuickChat_Disco
   unlock_item_id: emote_disco
@@ -70,10 +74,14 @@ None:
   leakyBucketMax: '10'
 OutOfSteam:
   isInUILayer: 'false'
   prefabName: QuickChat_OutOfSteam
   unlock_item_id: emote_outofsteam
+Pizza:
+  isInUILayer: 'false'
+  prefabName: QuickChat_Pizza
+  unlock_item_id: emote_pizza
 PurpleFireworks:
   hidden: 'true'
   isInUILayer: 'false'
   prefabName: QuickChat_Test
   unlock_item_id: emote_purple_fireworks
diff --git config_181210_2101/skills.txt config_190111_2315/skills.txt
index d15c3a9..10c5aac 100644
--- config_181210_2101/skills.txt
+++ config_190111_2315/skills.txt
@@ -305,11 +305,11 @@
         amount: '0.0'
         math: multiply
         name: energyRegenRate
     - effectIcon: effecticon_rangeboost
     volatileConditions:
-    - healthAboveOrEq: '0.8'
+    - superspeed: 'false'
 - conditions:
   - planeClass: olfaithful
   cost: '2'
   icon: skillicon_oldfaithful
   id: olfaithful_2b
diff --git config_181210_2101/sounds.txt config_190111_2315/sounds.txt
index 83b9240..554d96b 100644
--- config_181210_2101/sounds.txt
+++ config_190111_2315/sounds.txt
@@ -1,11 +1,13 @@
 ambientTracks:
   Dungeon: amb_overworld_wind01
   Nexus: amb_rebelcity_land_loop
+  Tutorial: amb_overworld_wind01
   World: amb_overworld_wind01
 customMusicTracks:
   BossFight: music_bosstrack01
+  TitleScreen: music_trailmini_vibey_loop
 enemyBigThreshold: '1.99'
 enemyBulletInstantSuffix: ''
 enemyBulletLongLifeSuffix: _3
 enemyBulletLongLifetime: '5'
 enemyBulletMidLifeSuffix: _2
@@ -21,10 +23,11 @@ enemyNearMidBullet: Enemy bullet slow medium
 enemyNearSmallBullet: Enemy bullet slow small
 enemyRangeThreshold: '3.5'
 generalMusicTracks:
   Dungeon: music_dungeon_general_loop
   Nexus: music_rebelcitylayer_general_loop
+  Tutorial: music_trailmini_radio_loop
   World: music_overworld_general_loop
 lastShotInClipSamples:
   default: Last Shot In Clip - machinegun
 minGuninterval: '0.05'
 questNotificationSamples:
@@ -48,10 +51,11 @@ samples:
   ExplosionBig_NoDebris_Hazard_Nuke: Explosion Hazardous Nuke
   ExplosionDestructableTerrain: Explosion medium
   ExplosionDestructableTerrain_Rock: Explosion medium
   ExplosionMed: Explosion large
   ExplosionMed_Hazard_Hot: Explosion Hazardous Medium
+  ExplosionMed_Hazard_Medium: Explosion Hazardous Medium
   ExplosionShutDown: Explosion small
   ExplosionSmall: Explosion small
   ExplosionSmall_Hazard_Mild: Explosion Hazardous Mild
   Explosion_Hazard_Mild: Explosion Hazardous Mild
   blaster: Blaster1
diff --git config_181210_2101/store.txt config_190111_2315/store.txt
index 67eab99..9d57445 100644
--- config_181210_2101/store.txt
+++ config_190111_2315/store.txt
@@ -2285,10 +2285,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantRaptorProduct
+  id: store_unlock_playerclass_raptor_tiger
+  items:
+  - unlock_playerclass_raptor_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantHogProduct
   id: store_unlock_playerclass_hog_flames
   items:
   - unlock_playerclass_hog_flames
   postPurchaseActions:
@@ -2342,10 +2361,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantHogProduct
+  id: store_unlock_playerclass_hog_tiger
+  items:
+  - unlock_playerclass_hog_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantQuadProduct
   id: store_unlock_playerclass_walker_flames
   items:
   - unlock_playerclass_walker_flames
   postPurchaseActions:
@@ -2399,10 +2437,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantQuadProduct
+  id: store_unlock_playerclass_walker_tiger
+  items:
+  - unlock_playerclass_walker_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantOldFaithfulProduct
   id: store_unlock_playerclass_oldfaithful_flames
   items:
   - unlock_playerclass_oldfaithful_flames
   postPurchaseActions:
@@ -2532,10 +2589,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantDusterProduct
+  id: store_unlock_playerclass_duster_tiger
+  items:
+  - unlock_playerclass_duster_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantShieldMaidenProduct
   id: store_unlock_playerclass_shieldmaiden_flames
   items:
   - unlock_playerclass_shieldmaiden_flames
   postPurchaseActions:
@@ -2589,10 +2665,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantShieldMaidenProduct
+  id: store_unlock_playerclass_shieldmaiden_tiger
+  items:
+  - unlock_playerclass_shieldmaiden_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantPaladinProduct
   id: store_unlock_playerclass_paladin_flames
   items:
   - unlock_playerclass_paladin_flames
   postPurchaseActions:
@@ -2646,10 +2741,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantPaladinProduct
+  id: store_unlock_playerclass_paladin_tiger
+  items:
+  - unlock_playerclass_paladin_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantMerlinProduct
   id: store_unlock_playerclass_merlin_flames
   items:
   - unlock_playerclass_merlin_flames
   postPurchaseActions:
@@ -2703,10 +2817,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantMerlinProduct
+  id: store_unlock_playerclass_merlin_tiger
+  items:
+  - unlock_playerclass_merlin_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantEngineerProduct
   id: store_unlock_playerclass_engineer_flames
   items:
   - unlock_playerclass_engineer_flames
   postPurchaseActions:
@@ -2760,10 +2893,29 @@ products:
       currency: gold
   - id: scrap
     price:
       amount: '15000'
       currency: scrap
+  icon: ItemVariantEngineerProduct
+  id: store_unlock_playerclass_engineer_tiger
+  items:
+  - unlock_playerclass_engineer_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
   icon: ItemVariantBanditProduct
   id: store_unlock_playerclass_bandit_flames
   items:
   - unlock_playerclass_bandit_flames
   postPurchaseActions:
@@ -2808,10 +2960,29 @@ products:
   - nothing
   - use_instantly
   - storage
   tags:
   - item_variant_common
+- additional_price_tags:
+  - id: normal
+    price:
+      amount: '5000'
+      currency: gold
+  - id: scrap
+    price:
+      amount: '15000'
+      currency: scrap
+  icon: ItemVariantBanditProduct
+  id: store_unlock_playerclass_bandit_tiger
+  items:
+  - unlock_playerclass_bandit_tiger
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant_common
 - icon: ItemVariantAssaultRareProduct
   id: store_unlock_playerclass_assault_varianta
   items:
   - unlock_playerclass_assault_varianta
   normal_price:
@@ -2919,10 +3090,24 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantRaptorRareProduct
+  id: store_unlock_playerclass_raptor_camo
+  items:
+  - unlock_playerclass_raptor_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantHogRareProduct
   id: store_unlock_playerclass_hog_varianta
   items:
   - unlock_playerclass_hog_varianta
   normal_price:
@@ -2947,10 +3132,24 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantHogRareProduct
+  id: store_unlock_playerclass_hog_camo
+  items:
+  - unlock_playerclass_hog_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantQuadRareProduct
   id: store_unlock_playerclass_walker_varianta
   items:
   - unlock_playerclass_walker_varianta
   normal_price:
@@ -2977,10 +3176,25 @@ products:
   - storage
   preview_plane_scale: '0.8'
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantQuadRareProduct
+  id: store_unlock_playerclass_walker_camo
+  items:
+  - unlock_playerclass_walker_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  preview_plane_scale: '0.8'
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantOldFaithfulRareProduct
   id: store_unlock_playerclass_oldfaithful_varianta
   items:
   - unlock_playerclass_oldfaithful_varianta
   normal_price:
@@ -3047,10 +3261,24 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantDusterRareProduct
+  id: store_unlock_playerclass_duster_camo
+  items:
+  - unlock_playerclass_duster_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantShieldMaidenRareProduct
   id: store_unlock_playerclass_shieldmaiden_varianta
   items:
   - unlock_playerclass_shieldmaiden_varianta
   normal_price:
@@ -3077,10 +3305,25 @@ products:
   - storage
   preview_plane_scale: '0.6'
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantShieldMaidenRareProduct
+  id: store_unlock_playerclass_shieldmaiden_camo
+  items:
+  - unlock_playerclass_shieldmaiden_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  preview_plane_scale: '0.6'
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantPaladinRareProduct
   id: store_unlock_playerclass_paladin_varianta
   items:
   - unlock_playerclass_paladin_varianta
   normal_price:
@@ -3107,10 +3350,25 @@ products:
   - storage
   preview_plane_scale: '0.5'
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantPaladinRareProduct
+  id: store_unlock_playerclass_paladin_camo
+  items:
+  - unlock_playerclass_paladin_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  preview_plane_scale: '0.5'
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantMerlinRareProduct
   id: store_unlock_playerclass_merlin_varianta
   items:
   - unlock_playerclass_merlin_varianta
   normal_price:
@@ -3135,10 +3393,24 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantMerlinRareProduct
+  id: store_unlock_playerclass_merlin_camo
+  items:
+  - unlock_playerclass_merlin_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantEngineerRareProduct
   id: store_unlock_playerclass_engineer_varianta
   items:
   - unlock_playerclass_engineer_varianta
   normal_price:
@@ -3163,10 +3435,24 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantEngineerRareProduct
+  id: store_unlock_playerclass_engineer_camo
+  items:
+  - unlock_playerclass_engineer_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantBanditRareProduct
   id: store_unlock_playerclass_bandit_varianta
   items:
   - unlock_playerclass_bandit_varianta
   normal_price:
@@ -3191,10 +3477,24 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_rare
+- icon: ItemVariantBanditRareProduct
+  id: store_unlock_playerclass_bandit_camo
+  items:
+  - unlock_playerclass_bandit_camo
+  normal_price:
+    amount: '7000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_rare
 - icon: ItemVariantQuadEpicProduct
   id: store_unlock_playerclass_walker_epica
   items:
   - unlock_playerclass_walker_epica
   normal_price:
@@ -3206,10 +3506,55 @@ products:
   - storage
   preview_plane_scale: '0.8'
   tags:
   - item_variant
   - item_variant_epic
+- icon: ItemVariantQuadEpicProduct
+  id: store_unlock_playerclass_walker_epicb
+  items:
+  - unlock_playerclass_walker_epicb
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  preview_plane_scale: '0.8'
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantQuadEpicProduct
+  id: store_unlock_playerclass_walker_epicc
+  items:
+  - unlock_playerclass_walker_epicc
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  preview_plane_scale: '0.8'
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantQuadEpicProduct
+  id: store_unlock_playerclass_walker_epicd
+  items:
+  - unlock_playerclass_walker_epicd
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  preview_plane_scale: '0.8'
+  tags:
+  - item_variant
+  - item_variant_epic
 - icon: ItemVariantMedicEpicProduct
   id: store_unlock_playerclass_medic_epica
   items:
   - unlock_playerclass_medic_epica
   normal_price:
@@ -3276,10 +3621,52 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_epic
+- icon: ItemVariantHogEpicProduct
+  id: store_unlock_playerclass_hog_epicb
+  items:
+  - unlock_playerclass_hog_epicb
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantHogEpicProduct
+  id: store_unlock_playerclass_hog_epicc
+  items:
+  - unlock_playerclass_hog_epicc
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantHogEpicProduct
+  id: store_unlock_playerclass_hog_epicd
+  items:
+  - unlock_playerclass_hog_epicd
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
 - icon: ItemVariantOldFaithfulEpicProduct
   id: store_unlock_playerclass_oldfaithful_epica
   items:
   - unlock_playerclass_oldfaithful_epica
   normal_price:
@@ -3416,10 +3803,52 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_epic
+- icon: ItemVariantPaladinEpicProduct
+  id: store_unlock_playerclass_paladin_epicb
+  items:
+  - unlock_playerclass_paladin_epicb
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantPaladinEpicProduct
+  id: store_unlock_playerclass_paladin_epicc
+  items:
+  - unlock_playerclass_paladin_epicc
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantPaladinEpicProduct
+  id: store_unlock_playerclass_paladin_epicd
+  items:
+  - unlock_playerclass_paladin_epicd
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
 - icon: ItemVariantShieldMaidenEpicProduct
   id: store_unlock_playerclass_shieldmaiden_epica
   items:
   - unlock_playerclass_shieldmaiden_epica
   normal_price:
@@ -3430,10 +3859,52 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_epic
+- icon: ItemVariantShieldMaidenEpicProduct
+  id: store_unlock_playerclass_shieldmaiden_epicb
+  items:
+  - unlock_playerclass_shieldmaiden_epicb
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantShieldMaidenEpicProduct
+  id: store_unlock_playerclass_shieldmaiden_epicc
+  items:
+  - unlock_playerclass_shieldmaiden_epicc
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantShieldMaidenEpicProduct
+  id: store_unlock_playerclass_shieldmaiden_epicd
+  items:
+  - unlock_playerclass_shieldmaiden_epicd
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
 - icon: ItemVariantDusterEpicProduct
   id: store_unlock_playerclass_duster_epica
   items:
   - unlock_playerclass_duster_epica
   normal_price:
@@ -3444,10 +3915,52 @@ products:
   - use_instantly
   - storage
   tags:
   - item_variant
   - item_variant_epic
+- icon: ItemVariantDusterEpicProduct
+  id: store_unlock_playerclass_duster_epicb
+  items:
+  - unlock_playerclass_duster_epicb
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantDusterEpicProduct
+  id: store_unlock_playerclass_duster_epicc
+  items:
+  - unlock_playerclass_duster_epicc
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
+- icon: ItemVariantDusterEpicProduct
+  id: store_unlock_playerclass_duster_epicd
+  items:
+  - unlock_playerclass_duster_epicd
+  normal_price:
+    amount: '15000'
+    currency: gold
+  postPurchaseActions:
+  - nothing
+  - use_instantly
+  - storage
+  tags:
+  - item_variant
+  - item_variant_epic
 - icon: ItemVariantBanditEpicProduct
   id: store_unlock_playerclass_bandit_epica
   items:
   - unlock_playerclass_bandit_epica
   normal_price:
diff --git config_181210_2101/territories.txt config_190111_2315/territories.txt
index 847c494..02abd50 100644
--- config_181210_2101/territories.txt
+++ config_190111_2315/territories.txt
@@ -745,19 +745,30 @@
         parameterF1: '-3'
         parameterF2: '-1.6'
         reaction: lore_text_relative_pos
         rotation: '0'
       trigger: crafter
+    - condition:
+        code: NotOnceKeySet
+        name: crafting_intro
+      once_key: crafting_intro
+      reactions:
+      - asset: crafting_intro
+        parameter: sergeant
+        reaction: dialogue_text
+      trigger: crafter_docked
     - reactions:
       - asset: LoreTextClientArrow
         parameter: tutorial_pilot_school_hint
         parameterF0: '-3'
         parameterF1: '-3'
         parameterF2: '-1.6'
         reaction: lore_text_relative_pos
         rotation: '-90'
       trigger: pilot_school
+    persistentOnceKeys:
+    - crafting_intro
   distancePerElevation: '0.15'
   localChatDistance: '0'
   maxAllowedOverlapOnSubterritory: '0.9'
   maxDiskRadius: '20'
   minDiskRadius: '7'