diff --git a/client/assets/styles/instance.css b/client/assets/styles/instance.css
index c2c8d0ea..4ac3402a 100644
--- a/client/assets/styles/instance.css
+++ b/client/assets/styles/instance.css
@@ -5,7 +5,7 @@
.instance {
overflow-x: hidden;
display: grid;
- grid-template-columns: 2fr 1fr;
+ grid-template-columns: 2fr minmax(min-content, 1fr);
grid-template-rows: min-content min-content min-content 1fr;
grid-template-areas:
@@ -29,8 +29,8 @@
grid-area: top;
}
-.instance .scoreboard {
- grid-area: constructs;
+.instance.lobby {
+ align-content: center;
}
.scoreboard .ready {
@@ -406,7 +406,7 @@
}
.thresholds figure svg {
- height: 2em;
+ height: 1.5em;
}
.thresholds .unmet {
diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx
index 0ff4d243..718c062a 100644
--- a/client/src/components/instance.component.jsx
+++ b/client/src/components/instance.component.jsx
@@ -35,15 +35,18 @@ function Instance(args) {
} = args;
if (!instance) return false;
+
+ if (instance.phase !== 'InProgress') {
+ return (
+ setInfo(null)} >
+
+
+ );
+ }
+
const instanceClasses = `instance ${nav === 'constructs' ? 'constructs-visible' : ''}`;
-
- const lobbyInfo = (instance.phase === 'InProgress')
- ? null
- : ;
-
return (
setInfo(null)} >
- {lobbyInfo}
diff --git a/client/src/components/svgs/circle.jsx b/client/src/components/svgs/circle.jsx
index c5a229ed..a175ada0 100644
--- a/client/src/components/svgs/circle.jsx
+++ b/client/src/components/svgs/circle.jsx
@@ -24,9 +24,9 @@ module.exports = function circle(colours) {
-
-
-
+
+
+
);
};
diff --git a/client/src/components/svgs/square.jsx b/client/src/components/svgs/square.jsx
index 6565fe80..ecfb1298 100644
--- a/client/src/components/svgs/square.jsx
+++ b/client/src/components/svgs/square.jsx
@@ -26,9 +26,9 @@ module.exports = function square(colours) {
-
-
-
+
+
+
);
}
diff --git a/client/src/components/svgs/triangle.jsx b/client/src/components/svgs/triangle.jsx
index bbbfcf8f..1cfcc2e7 100644
--- a/client/src/components/svgs/triangle.jsx
+++ b/client/src/components/svgs/triangle.jsx
@@ -21,17 +21,13 @@ module.exports = function triangle(colours) {
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
);
};
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 258d0b9b..e44b732a 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -95,7 +95,6 @@ function Vbox(args) {
} = args;
if (!player) return false;
- if (instance.phase === 'Lobby') return false;
const { vbox } = player;
// function setHighlight(type) {
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 0c28c586..d22bb9c7 100644
--- a/server/src/instance.rs
+++ b/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")),
}
}
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 18d1abb2..22f222f8 100644
--- a/server/src/skill.rs
+++ b/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)));