diff --git a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron index 0cf398f526..2ae40ac26a 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron @@ -4,7 +4,7 @@ BasicRanged( recover_duration: 0.7, projectile: Poisonball( damage: 50.0, - radius: 3.0, + radius: 2.75, energy_regen: 0, min_falloff: 0.2, ), @@ -14,6 +14,6 @@ BasicRanged( ..Default::default() }),*/ projectile_speed: 260.0, - num_projectiles: 3, + num_projectiles: 1, projectile_spread: 0.3, ) \ No newline at end of file diff --git a/assets/common/abilities/custom/basilisk/petrify.ron b/assets/common/abilities/custom/basilisk/petrify.ron index 796aa7e936..dc48f20b3f 100644 --- a/assets/common/abilities/custom/basilisk/petrify.ron +++ b/assets/common/abilities/custom/basilisk/petrify.ron @@ -1,9 +1,9 @@ BasicBeam( buildup_duration: 1.8, recover_duration: 1.0, - beam_duration: 1.0, - damage: 84.0, - tick_rate: 0.5, + beam_duration: 1.15, + damage: 64.0, + tick_rate: 0.35, range: 22.0, max_angle: 5.0, damage_effect: Some(Buff(( diff --git a/assets/common/abilities/custom/theropodbird/triplestrike.ron b/assets/common/abilities/custom/theropodbird/triplestrike.ron index f1e4103f77..72a4a4d79a 100644 --- a/assets/common/abilities/custom/theropodbird/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbird/triplestrike.ron @@ -2,17 +2,17 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 22.0, + base_damage: 16.5, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, knockback: 3.0, range: 3.0, angle: 15.0, - base_buildup_duration: 1.3, + base_buildup_duration: 1.0, base_swing_duration: 0.15, hit_timing: 0.5, - base_recover_duration: 0.6, + base_recover_duration: 0.45, forward_movement: 1.0, damage_kind: Crushing, ), @@ -25,10 +25,10 @@ ComboMelee( knockback: 3.0, range: 3.0, angle: 15.0, - base_buildup_duration: 0.8, + base_buildup_duration: 0.6, base_swing_duration: 0.15, hit_timing: 0.5, - base_recover_duration: 0.6, + base_recover_duration: 0.45, forward_movement: 1.0, damage_kind: Crushing, ), @@ -41,10 +41,10 @@ ComboMelee( knockback: 3.0, range: 3.0, angle: 15.0, - base_buildup_duration: 0.7, + base_buildup_duration: 0.475, base_swing_duration: 0.125, hit_timing: 0.5, - base_recover_duration: 1.8, + base_recover_duration: 1.35, forward_movement: 1.0, damage_kind: Crushing, ), diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index 29030d7a0d..d381b391b1 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -549,18 +549,18 @@ pub fn apply_caves_supplement<'a>( _ => "common.entity.wild.aggressive.batfox", } } else if cave_depth < 120.0 { - match dynamic_rng.gen_range(0..5) { - 0 => "common.entity.wild.aggressive.rocksnapper", - 1 => "common.entity.wild.aggressive.cave_salamander", - 2 => "common.entity.wild.aggressive.cave_spider", - 4 => "common.entity.wild.peaceful.crawler_molten", + match dynamic_rng.gen_range(0..10) { + 2 => "common.entity.wild.aggressive.rocksnapper", + 5 => "common.entity.wild.aggressive.cave_salamander", + 7 => "common.entity.wild.aggressive.cave_spider", + 8 => "common.entity.wild.peaceful.crawler_molten", _ => "common.entity.wild.aggressive.asp", } } else if cave_depth < 190.0 { - match dynamic_rng.gen_range(0..4) { - 0 => "common.entity.wild.aggressive.rocksnapper", - 1 => "common.entity.wild.aggressive.lavadrake", - 2 => "common.entity.wild.aggressive.black_widow", + match dynamic_rng.gen_range(0..5) { + 1 => "common.entity.wild.aggressive.rocksnapper", + 2 => "common.entity.wild.aggressive.lavadrake", + 3 => "common.entity.wild.aggressive.black_widow", _ => "common.entity.wild.aggressive.basilisk", } } else {