From 7828112486838479f13f6c10cc6670ce113962a4 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 22 May 2021 15:00:05 -0500
Subject: [PATCH] Balance tweaks.

---
 assets/common/abilities/bow/charged.ron | 12 ++++++------
 assets/common/abilities/bow/shotgun.ron |  2 +-
 assets/voxygen/i18n/en/skills.ron       |  2 +-
 common/src/comp/ability.rs              | 17 +++++++++++++----
 common/src/states/repeater_ranged.rs    |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/assets/common/abilities/bow/charged.ron b/assets/common/abilities/bow/charged.ron
index ae1d7ec7bc..b8469ad2c8 100644
--- a/assets/common/abilities/bow/charged.ron
+++ b/assets/common/abilities/bow/charged.ron
@@ -1,19 +1,19 @@
 ChargedRanged(
     energy_cost: 0,
     energy_drain: 0,
-    initial_regen: 0,
-    scaled_regen: 200,
-    initial_damage: 0,
-    scaled_damage: 300,
+    initial_regen: 50,
+    scaled_regen: 150,
+    initial_damage: 50,
+    scaled_damage: 200,
     initial_knockback: 0.0,
     scaled_knockback: 10.0,
     speed: 1.0,
     buildup_duration: 0.2,
-    charge_duration: 3.0,
+    charge_duration: 2.0,
     recover_duration: 0.3,
     projectile_body: Object(Arrow),
     projectile_light: None,
     initial_projectile_speed: 100.0,
     scaled_projectile_speed: 150.0,
-    move_speed: 0.5,
+    move_speed: 0.6,
 )
diff --git a/assets/common/abilities/bow/shotgun.ron b/assets/common/abilities/bow/shotgun.ron
index eb4d779610..9911275b59 100644
--- a/assets/common/abilities/bow/shotgun.ron
+++ b/assets/common/abilities/bow/shotgun.ron
@@ -11,5 +11,5 @@ BasicRanged(
     projectile_body: Object(Arrow),
     projectile_light: None,
     projectile_speed: 60.0,
-    num_projectiles: 6,
+    num_projectiles: 4,
 )
diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron
index 996ba5f95b..93ae9ffb7e 100644
--- a/assets/voxygen/i18n/en/skills.ron
+++ b/assets/voxygen/i18n/en/skills.ron
@@ -115,7 +115,7 @@
         "hud.skill.bow_charged_speed_title" : "Charged Speed",
         "hud.skill.bow_charged_speed" : "Increases the rate that you charge the attack by 10%{SP}",
         "hud.skill.bow_charged_move_title" : "Charged Move Speed",
-        "hud.skill.bow_charged_move" : "Increases how fast you can shuffle while charging the attack by 20%{SP}",
+        "hud.skill.bow_charged_move" : "Increases how fast you can shuffle while charging the attack by 10%{SP}",
         "hud.skill.bow_repeater_title" : "Repeater",
         "hud.skill.bow_repeater" : "Shoots faster the longer you fire for",
         "hud.skill.bow_repeater_damage_title" : "Repeater Damage",
diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index 1a61bcf448..e616a872ac 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -940,8 +940,11 @@ impl CharacterAbility {
                 use skills::BowSkill::*;
                 match self {
                     ChargedRanged {
+                        ref mut initial_damage,
                         ref mut scaled_damage,
+                        ref mut initial_regen,
                         ref mut scaled_regen,
+                        ref mut initial_knockback,
                         ref mut scaled_knockback,
                         ref mut speed,
                         ref mut move_speed,
@@ -955,19 +958,25 @@ impl CharacterAbility {
                             *scaled_projectile_speed *= projectile_speed_scaling;
                         }
                         if let Ok(Some(level)) = skillset.skill_level(Bow(CDamage)) {
-                            *scaled_damage *= 1.2_f32.powi(level.into());
+                            let damage_scaling = 1.2_f32.powi(level.into());
+                            *initial_damage *= damage_scaling;
+                            *scaled_damage *= damage_scaling;
                         }
                         if let Ok(Some(level)) = skillset.skill_level(Bow(CRegen)) {
-                            *scaled_regen *= 1.2_f32.powi(level.into());
+                            let regen_scaling = 1.2_f32.powi(level.into());
+                            *initial_regen *= regen_scaling;
+                            *scaled_regen *= regen_scaling;
                         }
                         if let Ok(Some(level)) = skillset.skill_level(Bow(CKnockback)) {
-                            *scaled_knockback *= 1.2_f32.powi(level.into());
+                            let knockback_scaling = 1.2_f32.powi(level.into());
+                            *initial_knockback *= knockback_scaling;
+                            *scaled_knockback *= knockback_scaling;
                         }
                         if let Ok(Some(level)) = skillset.skill_level(Bow(CSpeed)) {
                             *speed *= 1.1_f32.powi(level.into());
                         }
                         if let Ok(Some(level)) = skillset.skill_level(Bow(CMove)) {
-                            *move_speed *= 1.2_f32.powi(level.into());
+                            *move_speed *= 1.1_f32.powi(level.into());
                         }
                     },
                     RepeaterRanged {
diff --git a/common/src/states/repeater_ranged.rs b/common/src/states/repeater_ranged.rs
index c4280219b5..f28b2c7ca3 100644
--- a/common/src/states/repeater_ranged.rs
+++ b/common/src/states/repeater_ranged.rs
@@ -55,7 +55,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
         handle_orientation(data, &mut update, 1.0);
-        handle_move(data, &mut update, 0.1);
+        handle_move(data, &mut update, 0.3);
 
         match self.stage_section {
             StageSection::Buildup => {