From a42e6e20b8929c5fde02821a83ef7f5188297d00 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Wed, 16 Jun 2021 21:48:24 -0400
Subject: [PATCH] basilisk tweaks

---
 .../common/abilities/ability_set_manifest.ron |  8 +++++---
 .../common/abilities/custom/basilisk/dash.ron | 20 +++++++++++++++++++
 assets/common/cave_scatter/deep_floor.ron     |  2 +-
 common/src/comp/inventory/loadout_builder.rs  |  2 +-
 world/src/layer/mod.rs                        |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 assets/common/abilities/custom/basilisk/dash.ron

diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron
index a9e33c3b0b..12eb751aad 100644
--- a/assets/common/abilities/ability_set_manifest.ron
+++ b/assets/common/abilities/ability_set_manifest.ron
@@ -149,9 +149,11 @@
         abilities: [],
     ),
     Custom("Basilisk"): (
-        primary: "common.abilities.custom.basilisk.triplestrike",
-        secondary: "common.abilities.custom.basilisk.petrify",
-        abilities: [],
+        primary: "common.abilities.custom.basilisk.petrify",
+        secondary: "common.abilities.custom.basilisk.triplestrike",
+        abilities: [
+            (None, "common.abilities.custom.basilisk.dash"),
+        ],
     ),
     Custom("Asp"): (
         primary: "common.abilities.custom.asp.singlestrike",
diff --git a/assets/common/abilities/custom/basilisk/dash.ron b/assets/common/abilities/custom/basilisk/dash.ron
new file mode 100644
index 0000000000..8221e8092d
--- /dev/null
+++ b/assets/common/abilities/custom/basilisk/dash.ron
@@ -0,0 +1,20 @@
+DashMelee(
+    energy_cost: 0,
+    base_damage: 120,
+    scaled_damage: 180,
+    base_poise_damage: 25,
+    scaled_poise_damage: 0,
+    base_knockback: 4.0,
+    scaled_knockback: 17.0,
+    range: 2.5,
+    angle: 45.0,
+    energy_drain: 0,
+    forward_speed: 4.0,
+    buildup_duration: 0.8,
+    charge_duration: 1.0,
+    swing_duration: 0.1,
+    recover_duration: 1.0,
+    charge_through: true,
+    is_interruptible: false,
+    damage_kind: Crushing,
+)
diff --git a/assets/common/cave_scatter/deep_floor.ron b/assets/common/cave_scatter/deep_floor.ron
index c18d335e7a..0594c8679a 100644
--- a/assets/common/cave_scatter/deep_floor.ron
+++ b/assets/common/cave_scatter/deep_floor.ron
@@ -6,7 +6,7 @@
     (30, AmethystSmall),
     (30, TopazSmall),
     (16, SapphireSmall),
-    (60, CrystalLow),
+    (100, CrystalLow),
     (12, EmeraldSmall),
     (15, Cobalt),
     (40, Coal),
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index 5c8f48345f..d4396b2749 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -423,7 +423,7 @@ impl LoadoutBuilder {
                     | biped_large::Species::Cyclops
                     | biped_large::Species::Blueoni
                     | biped_large::Species::Redoni
-                    | biped_large::Species::Troll
+                    | biped_large::Species::Cavetroll
                     | biped_large::Species::Wendigo,
                 ..
             }) => self.chest(Some(Item::new_from_asset_expect(
diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs
index 847650313c..f448f71f79 100644
--- a/world/src/layer/mod.rs
+++ b/world/src/layer/mod.rs
@@ -349,7 +349,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) {
                     );
                 }
             } else if cave_depth < 200.0 && cave_depth > 80.0 {
-                if rng.gen::<f32>() < 0.08 * (cave_x.max(0.5).powf(4.0)) && !vein_condition {
+                if rng.gen::<f32>() < 0.065 * (cave_x.max(0.5).powf(4.0)) && !vein_condition {
                     let kind =
                         *Lottery::<SpriteKind>::load_expect("common.cave_scatter.deep_floor")
                             .read()