fix stuff n tings

server/src/instance.rs

@@ -52,7 +52,7 @@ pub enum TimeControl {
 impl TimeControl {
     fn vbox_time_seconds(&self) -> i64 {
         match self {
-            TimeControl::Standard => 120,
+            TimeControl::Standard => 180,
             TimeControl::Slow => 240,
             TimeControl::Practice => panic!("practice vbox seconds called"),
         }
@@ -85,7 +85,7 @@ impl TimeControl {
         match self {
             TimeControl::Practice => None,
             _ => Some(Utc::now()
-                .checked_add_signed(Duration::milliseconds(self.vbox_time_seconds() * 1000 + resolution_time_ms))
+                .checked_add_signed(Duration::milliseconds(self.game_time_seconds() * 1000 + resolution_time_ms))
                 .expect("could not set game phase end")),
         }
     }

server/src/skill.rs

@@ -1251,7 +1251,7 @@ fn bash(source: &mut Construct, target: &mut Construct, mut results: Resolutions
             }
         }
 
-        let amount = source.red_power().pct(skill.multiplier().saturating_mul(cds));
+        let amount = source.red_power().pct(skill.multiplier().pct(100 + 45u64.saturating_mul(cds)));
         target.deal_red_damage(skill, amount)
             .into_iter()
             .for_each(|e| results.push(Resolution::new(source, target).event(e).stages(LogStages::PostOnly)));