19 files changed, 43 insertions(+), 38 deletions(-)

diff --git config_190509_2353/Texts/en-US/item.txt config_190510_2231/Texts/en-US/item.txt
index 2e78a47..a3ea13b 100644
--- config_190509_2353/Texts/en-US/item.txt
+++ config_190510_2231/Texts/en-US/item.txt
@@ -1226,38 +1226,38 @@ poison_9:
   name: Facemelter Acid
 poison_blast_0:
   description: Hit all enemy planes within range with acid damage.
   name: Training Blast
 poison_blast_1:
-  description: Our connections with the Free Castes provide an irregular monthly supply of various insect-derived reagents.
+  description: Our alliance with the Free Castes provide an irregular monthly drop of various insect-derived reagents.
   name: Cloric Blast
 poison_blast_10:
-  description: Hit all enemy planes within range with acid damage.
+  description: Spider music is traditionally only played during death hunts for one's honored elderly.
   name: Deathstalker
 poison_blast_2:
-  description: Hit all enemy planes within range with acid damage.
+  description: There is much discussion over whether or not a destructive bio-reagent is a venom, poison or acid. The degenerate slang of of this debased era tends to mix all these willy-nilly. Pah, no respect for proper terminology.
   name: Citric Blast
 poison_blast_3:
-  description: Hit all enemy planes within range with acid damage.
+  description: The spider-kin of the great Southern Isle (darkly named Oz by local sailors) are uniformly deadly. While snake castes generate substances that produce otherworldly hive states, spider kept their individualistic hunting instincts and culture.
   name: Formic Blast
 poison_blast_4:
-  description: Hit all enemy planes within range with acid damage.
+  description: What is honor to a free arachnid? We know it drives their society. But the rules are as complex and impenetrable as one of their tunnel web citadels. Each interaction, a trap. And to cause offense is to declare yourself prey.
   name: Alum Blast
 poison_blast_5:
-  description: Hit all enemy planes within range with acid damage.
+  description: Formic species allied early with the arachnids priest-queens. In practice, they seems to play the same service role as the mythical autonomous servants of the gyptian empires. The ant's aphid indoctrination was coopted by the Feline Empire for their first cruel iterations on spider farming.
   name: Acetic Blast
 poison_blast_6:
-  description: Hit all enemy planes within range with acid damage.
+  description: We know little about the Oz spider farms. Once proud hunters act lobotomized, willingly submitting to invasive milking. Rescued spiders are found crawling with small red parasites that shrivel and squeal when exposed to sunlight.
   name: Boric Blast
 poison_blast_7:
-  description: Hit all enemy planes within range with acid damage.
+  description: Self-modification is practiced by many insect-kin. Avians, in comparison, rely mostly on external apparatus to extend their capabilities. Where a bird might choose to build an aircraft if they want to fly long distances, a citadel queen would simply breed workers with immense glider wings.
   name: Magnesia Blast
 poison_blast_8:
-  description: Hit all enemy planes within range with acid damage.
+  description: At the heart of the device's pressure chambers is beetle-derived bio-engine that multiplies the acid reagent and feeds the effluence into a phase-critical field pulser.
   name: Ammonia Blast
 poison_blast_9:
-  description: Hit all enemy planes within range with acid damage.
+  description: Have you seen artist renditions of a priest-queen's chambers? There are no known photographs. But first hand reports suggest an architecture composed of vibrant structural weaving that merges seamless with countless statue-trophies of her vanquished enemies and husbands.
   name: Cyanide Blast
 quest_ambergris:
   description: Something flavorful or an attempt at such.
   name: Ambergris
 quest_bone:
diff --git config_190509_2353/Texts/en-US/quests.txt config_190510_2231/Texts/en-US/quests.txt
index 0dc7e63..177ee56 100644
--- config_190509_2353/Texts/en-US/quests.txt
+++ config_190510_2231/Texts/en-US/quests.txt
@@ -220,29 +220,29 @@ DQ_CX_51HMT_highmountainhunter:
   title: Meowzan Inquisition
 DQ_CX_51HMT_ninjaleader:
   description: Critics of the Empire are quickly found dead. These ''suicides'' are the work of the Secret Police. Find these officers and gather their hidden evidence so we can expose them.
   title: Spoliation of Evidence
 DQ_KB_berserker:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy Berserker and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Berserker'
 DQ_KB_clockboss:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the Time Ghost and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Time Ghost'
 DQ_KB_crawler:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy Fisher Crab and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Fisher Crab'
 DQ_KB_gargantua:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy Gargantua and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Gargantua'
 DQ_KB_pharaoh:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy Pharaoh and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Pharaoh'
 DQ_KB_tank:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy Big Dog and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Big Dog'
 DQ_KB_teslahq:
-  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the [Big Dog] and salvage its superior equipment. Bring friends, this one is dangerous.
+  description: The Empire gifted a massive war machine to one of their useless nobles. Destroy the Temple of Ra and salvage its superior equipment. Bring friends, this one is dangerous.
   title: 'Boss: Temple of Ra'
 DQ_KS_11LOW_squirrel_T2:
   description: Giant clusters of Squirrel ships are being lead by Squirrel Boss control ships.  These clusters are attacking unsuspecting ships flying through the Hunting Grounds.  Shut them down.
   title: Scurry
 DQ_KS_12LOW_gridboss_T3:
@@ -860,14 +860,14 @@ bounty_dungeon_rescue:
   title: 'Special Mission: The Dig'
 bounty_dungeon_rescue_week5:
   description: Finish today's target mission and receive Dark Steel.
   title: 'Special Mission: The Dig'
 bounty_dungeon_thief:
-  description: Finish today's target mission and receive Dark Steel.
+  description: Finish today's target mission and receive 2 random Elemental Steels.
   title: 'Special Mission: The Vaults'
 bounty_dungeon_thief_week5:
-  description: Finish today's target mission and receive Dark Steel.
+  description: Finish today's target mission and receive 2 random Elemental Steels.
   title: 'Special Mission: The Vaults'
 bounty_iceboss:
   description: Kill today's bounty and receive White Steel.
   title: 'Bounty: The Frozen Horror'
 bounty_iceboss_week5:
diff --git config_190509_2353/Texts/en-US/units.txt config_190510_2231/Texts/en-US/units.txt
index 0f04c36..35832b7 100644
--- config_190509_2353/Texts/en-US/units.txt
+++ config_190510_2231/Texts/en-US/units.txt
@@ -79,10 +79,11 @@ DQ_SP_5XHMT_mine_snakemancersnake01neck: Spark Snake
 DQ_SP_5XHMT_mine_snakemancersnake02: Spark Snake
 DQ_SP_5XHMT_mine_snakemancersnake03: Spark Snake
 DQ_SP_5XHMT_mine_thumper: Thumper
 DQ_SP_5XHMT_mine_thumpernavi: Thumperling
 DQ_SP_5XHMT_mine_treasure: Buried Treasure
+GRP1_highmountaingrunt_controller: City Guard
 SP_5XHMT_arena2entrance_mazerunner: Maze Parade
 SP_5XHMT_arena2entrance_mazerunnerbomb: Mazer Beam
 SP_5XHMT_arena2entrance_mazerunnersnake: Mazer Snake
 SP_5XHMT_arena2entrance_treasure: Treasure
 SP_5XHMT_arena2entrance_treasurelocked: Treasure
diff --git config_190509_2353/Units/63D - Bomb Dungeon/unit_bombbarrel.txt config_190510_2231/Units/63D - Bomb Dungeon/unit_bombbarrel.txt
index 80fc197..8fa7093 100644
--- config_190509_2353/Units/63D - Bomb Dungeon/unit_bombbarrel.txt	
+++ config_190510_2231/Units/63D - Bomb Dungeon/unit_bombbarrel.txt	
@@ -8,10 +8,14 @@ additionalStates:
       value: '5'
     - code: TypeNear
       name: chainreaction2
       toState: boom2
       value: '5'
+    - code: TypeNear
+      name: bombbarrelboom
+      toState: boom2
+      value: '5'
   - events:
     - code: Die
       delay: '0.4'
       value: '0'
     name: boom2
diff --git config_190509_2353/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewall.txt config_190510_2231/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewall.txt
index 88c14b1..32507f1 100644
--- config_190509_2353/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewall.txt	
+++ config_190510_2231/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewall.txt	
@@ -10,19 +10,19 @@ additionalStates:
       name: chainreaction
       toState: boom2
       value: '7'
   - events:
     - code: AdjustHealthBy
-      value: '-0.4'
+      value: '-1'
     name: boom
     transitions:
     - code: Time
       toState: initial
       value: '1'
   - events:
     - code: AdjustHealthBy
-      value: '-0.2'
+      value: '-0.5'
     name: boom2
     transitions:
     - code: Time
       toState: initial
       value: '1'
diff --git config_190509_2353/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewallstrong.txt config_190510_2231/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewallstrong.txt
index 2a53c7d..7e42f7e 100644
--- config_190509_2353/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewallstrong.txt	
+++ config_190510_2231/Units/63D - Bomb Dungeon/zzz_bombdungeondestroyablewallstrong.txt	
@@ -10,19 +10,19 @@ additionalStates:
       name: chainreaction
       toState: boom2
       value: '7'
   - events:
     - code: AdjustHealthBy
-      value: '-0.2'
+      value: '-1'
     name: boom
     transitions:
     - code: Time
       toState: initial
       value: '1'
   - events:
     - code: AdjustHealthBy
-      value: '-0.1'
+      value: '-0.95'
     name: boom2
     transitions:
     - code: Time
       toState: initial
       value: '1'
@@ -35,11 +35,11 @@ energyRegenRate: '0'
 explosionPrefab: ExplosionDestructableTerrain
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 isWall: 'true'
 maxEnergyPoints: '1'
-maxHitPoints: '60'
+maxHitPoints: '100'
 maxSpeed: '0.0'
 maxTurnRate: '0'
 minSpeed: '0.0'
 showName: never
 showStats: always
diff --git config_190509_2353/Units/64D - Obstacle Dungeon/BOS2_wavemaster.txt config_190510_2231/Units/64D - Obstacle Dungeon/BOS2_wavemaster.txt
index 0f91c89..b429bc0 100644
--- config_190509_2353/Units/64D - Obstacle Dungeon/BOS2_wavemaster.txt	
+++ config_190510_2231/Units/64D - Obstacle Dungeon/BOS2_wavemaster.txt	
@@ -11,12 +11,10 @@ additionalStates:
     transitions:
     - code: Auto
       toState: main
       value: '0'
   - events:
-    - code: GunAwake
-      name: main
     - code: StopEffect
       name: Shielded
       value: '1.0'
     name: main
     transitions:
@@ -95,10 +93,11 @@ gunMounts:
   - '0'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
+  syncOffset: '0'
   syncTo: main
 gunTypes:
 - bulletPrefab: leisurelyBullet
   burst: '10'
   cooldown: '1'
@@ -136,9 +135,9 @@ particlePositions:
   - '-1.38'
   rot:
   - '0'
   - '0'
   - '-90'
-spawnInvulnerabilitySeconds: '0'
+spawnInvulnerabilitySeconds: '6'
 templateName: wavemaster
 tier: '3'
 xpMultiplier: '1.3'
diff --git config_190509_2353/Units/Items/unit_allyturret.txt config_190510_2231/Units/Items/unit_allyturret.txt
index 8681eec..5a9f3fe 100644
--- config_190509_2353/Units/Items/unit_allyturret.txt
+++ config_190510_2231/Units/Items/unit_allyturret.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturretGun
   mountAngle: '0'
   mountName: allyturretMount
diff --git config_190509_2353/Units/Items/unit_allyturret1.txt config_190510_2231/Units/Items/unit_allyturret1.txt
index ced9e8b..7460bac 100644
--- config_190509_2353/Units/Items/unit_allyturret1.txt
+++ config_190510_2231/Units/Items/unit_allyturret1.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret1Gun
   mountAngle: '0'
   mountName: allyturret1Mount
diff --git config_190509_2353/Units/Items/unit_allyturret10.txt config_190510_2231/Units/Items/unit_allyturret10.txt
index 90f62f1..c2762a0 100644
--- config_190509_2353/Units/Items/unit_allyturret10.txt
+++ config_190510_2231/Units/Items/unit_allyturret10.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret10Gun
   mountAngle: '0'
   mountName: allyturret10Mount
diff --git config_190509_2353/Units/Items/unit_allyturret2.txt config_190510_2231/Units/Items/unit_allyturret2.txt
index d0ca8a8..d7530ee 100644
--- config_190509_2353/Units/Items/unit_allyturret2.txt
+++ config_190510_2231/Units/Items/unit_allyturret2.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret2Gun
   mountAngle: '0'
   mountName: allyturret2Mount
diff --git config_190509_2353/Units/Items/unit_allyturret3.txt config_190510_2231/Units/Items/unit_allyturret3.txt
index 4a2ae22..889da80 100644
--- config_190509_2353/Units/Items/unit_allyturret3.txt
+++ config_190510_2231/Units/Items/unit_allyturret3.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret3Gun
   mountAngle: '0'
   mountName: allyturret3Mount
diff --git config_190509_2353/Units/Items/unit_allyturret4.txt config_190510_2231/Units/Items/unit_allyturret4.txt
index 45c691e..9195b3c 100644
--- config_190509_2353/Units/Items/unit_allyturret4.txt
+++ config_190510_2231/Units/Items/unit_allyturret4.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret4Gun
   mountAngle: '0'
   mountName: allyturret4Mount
diff --git config_190509_2353/Units/Items/unit_allyturret5.txt config_190510_2231/Units/Items/unit_allyturret5.txt
index 39a37e7..e5e520a 100644
--- config_190509_2353/Units/Items/unit_allyturret5.txt
+++ config_190510_2231/Units/Items/unit_allyturret5.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret5Gun
   mountAngle: '0'
   mountName: allyturret5Mount
diff --git config_190509_2353/Units/Items/unit_allyturret6.txt config_190510_2231/Units/Items/unit_allyturret6.txt
index 6298240..be2dde2 100644
--- config_190509_2353/Units/Items/unit_allyturret6.txt
+++ config_190510_2231/Units/Items/unit_allyturret6.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret6Gun
   mountAngle: '0'
   mountName: allyturret6Mount
diff --git config_190509_2353/Units/Items/unit_allyturret7.txt config_190510_2231/Units/Items/unit_allyturret7.txt
index aa80386..6e5ff37 100644
--- config_190509_2353/Units/Items/unit_allyturret7.txt
+++ config_190510_2231/Units/Items/unit_allyturret7.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret7Gun
   mountAngle: '0'
   mountName: allyturret7Mount
diff --git config_190509_2353/Units/Items/unit_allyturret8.txt config_190510_2231/Units/Items/unit_allyturret8.txt
index a60a964..d7e3543 100644
--- config_190509_2353/Units/Items/unit_allyturret8.txt
+++ config_190510_2231/Units/Items/unit_allyturret8.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret8Gun
   mountAngle: '0'
   mountName: allyturret8Mount
diff --git config_190509_2353/Units/Items/unit_allyturret9.txt config_190510_2231/Units/Items/unit_allyturret9.txt
index 57c5a4e..a1ddbee 100644
--- config_190509_2353/Units/Items/unit_allyturret9.txt
+++ config_190510_2231/Units/Items/unit_allyturret9.txt
@@ -3,11 +3,11 @@ artScale: '1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 gunMounts:
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '40'
   flashOffset: '0.0'
   gunTemplateName: allyturret9Gun
   mountAngle: '0'
   mountName: allyturret9Mount
diff --git config_190509_2353/maneuvers.txt config_190510_2231/maneuvers.txt
index 9469209..12abd29 100644
--- config_190509_2353/maneuvers.txt
+++ config_190510_2231/maneuvers.txt
@@ -2,10 +2,11 @@
   duration2: '0.3'
   energy: '0'
   name: dock
   target1Speed: '14'
 - damage: '24'
+  damageReduction: '0.4'
   deceleration: '50'
   energy: '20'
   name: bash
   secondsToVelocity1: '0.19'
   target1Speed: '10'