diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c06d28a..c2c3cda7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
-## [1.8.3] - 2019-11-14
+## [1.8.5] - 2019-11-16
+### Fixed
+- Multiple ko event bug
+
+## [1.8.4] - 2019-11-14
### Fixed
- Bug with tutorial introduced in last patch
diff --git a/VERSION b/VERSION
index 7b378be3..ff2fd4fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.4
\ No newline at end of file
+1.8.5
\ No newline at end of file
diff --git a/acp/package.json b/acp/package.json
index 44afd85c..3ccf45a7 100644
--- a/acp/package.json
+++ b/acp/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-client",
- "version": "1.8.4",
+ "version": "1.8.5",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/client/changelog.html b/client/changelog.html
index 9dfc59eb..80ff3f64 100644
--- a/client/changelog.html
+++ b/client/changelog.html
@@ -731,10 +731,17 @@ pre {
}
}
CHANGELOG
-[1.8.3] - 2019-11-14
+[1.8.5] - 2019-11-16
Fixed
+
+[1.8.4] - 2019-11-14
+
+Fixed
+
- Bug with tutorial introduced in last patch
@@ -746,7 +753,7 @@ pre {
Condensed recipe display
-Fixed
+Fixed
- Construct display on info / demo page
- Case where a skill could send multiple ko events to target
@@ -773,14 +780,14 @@ pre {
[1.8.2] - 2019-11-10
-Fixed
+Fixed
- Duplicate button issue in reshape tab
[1.8.1] - 2019-11-09
-Fixed
+Fixed
- An issue where skills would not be put on cooldown after being used.
@@ -1077,7 +1084,7 @@ pre {
[1.6.5] - 2019-10-25
-Fixed
+Fixed
- Stripe being blocked no longer causes unrecoverable error
- Automatic ready up is now throttled after abandons
@@ -1109,7 +1116,7 @@ pre {
-Fixed
+Fixed
- Fixed issue where dots / hots would not trigger when reapplied at a higher speed
- Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.
@@ -1120,7 +1127,7 @@ pre {
[1.6.2] - 2019-10-20
-Fixed
+Fixed
- Combiner bug where it would preview items for different combinations
- Skill descriptions are cleared when animations start
@@ -1159,7 +1166,7 @@ pre {
-Fixed
+Fixed
- Matchmaking bug where server matches you with yourself
diff --git a/client/package.json b/client/package.json
index f8df9997..7a3dbf28 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-client",
- "version": "1.8.4",
+ "version": "1.8.5",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/ops/package.json b/ops/package.json
index 89b0dd0b..786f8024 100644
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
{
"name": "mnml-ops",
- "version": "1.8.4",
+ "version": "1.8.5",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index ca7845d4..8152eff9 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mnml"
-version = "1.8.4"
+version = "1.8.5"
authors = ["ntr "]
[dependencies]
diff --git a/server/src/skill.rs b/server/src/skill.rs
index d490bbec..d94cdc96 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -348,15 +348,16 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
};
}
}
+
+ if target.is_ko() && event_target.green == 0 {
+ // Make sure target ko is from this event
+ target.effects.clear();
+ resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly));
+ }
},
_ => (),
};
- if target.is_ko() && event_target.green == 0 {
- // Make sure target ko is from this event
- target.effects.clear();
- resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly));
- }
game.update_construct(&mut source);
game.update_construct(&mut target);