From 7d253ab65deba02124bd9acdb3ab5bb97e49d126 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 16:14:27 +1000 Subject: [PATCH 1/5] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a58fa60..813d8f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ ### Fixed - Construct display on info / demo page +- Case where a skill could send multiple ko events to target +- Resizing of vbox when you buy / create certain items ### Changed - Automatically shows a preview of combo item when you have 3 items selected for combining From c99f189c695d3ac0970b7c02a5d99f32ea54d4eb Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 19:04:25 +1000 Subject: [PATCH 2/5] better duplicate ko check --- server/src/skill.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/src/skill.rs b/server/src/skill.rs index cc700cd6..f7e95c89 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -299,9 +299,9 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut } fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> Resolutions { - for Resolution { source, target, event, stages: _ } in resolutions.clone() { + for Resolution { source, target: event_target, event, stages: _ } in resolutions.clone() { let mut source = game.construct_by_id(source.id).unwrap().clone(); - let mut target = game.construct_by_id(target.id).unwrap().clone(); + let mut target = game.construct_by_id(event_target.id).unwrap().clone(); match event { Event::Damage { amount, skill, mitigation, colour: c } => { @@ -352,18 +352,14 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> _ => (), }; - if target.is_ko() { + if target.is_ko() && event_target.green == 0 { + // Check target is actually ko if sending ko 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); - - if target.is_ko() { - // Don't loop for multiple resolutions which led to KO - break; - } }; return resolutions; From b6ce6a527742a24609a592aeea67b897c42d77c0 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 19:05:10 +1000 Subject: [PATCH 3/5] post_resolve --- server/src/skill.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/skill.rs b/server/src/skill.rs index f7e95c89..c67e86b9 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -299,8 +299,8 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut } fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> Resolutions { - for Resolution { source, target: event_target, event, stages: _ } in resolutions.clone() { - let mut source = game.construct_by_id(source.id).unwrap().clone(); + for Resolution { source: event_source, target: event_target, event, stages: _ } in resolutions.clone() { + let mut source = game.construct_by_id(event_source.id).unwrap().clone(); let mut target = game.construct_by_id(event_target.id).unwrap().clone(); match event { @@ -353,7 +353,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> }; if target.is_ko() && event_target.green == 0 { - // Check target is actually ko if sending ko event + // Make sure target ko is from this event target.effects.clear(); resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly)); } From 726981a8deaa2309d34a6eb2a10434a7c90255ba Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 19:09:21 +1000 Subject: [PATCH 4/5] changelog --- CHANGELOG.md | 5 +-- client/changelog.html | 75 +++++++++++++++++++++++++++++++------------ 2 files changed, 56 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 813d8f2a..99142b7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,18 +10,15 @@ ### Changed - Automatically shows a preview of combo item when you have 3 items selected for combining - - Only highlight the first available item slot when equipping - - Amplify no longer increase GreenPower - - Purify - Now removes all effects on target - Applies "Purified" increasing healing taken - - Purge - Now removes all effects on target + ## [1.8.2] - 2019-11-10 ### Fixed - Duplicate button issue in reshape tab diff --git a/client/changelog.html b/client/changelog.html index d43f4593..68719026 100644 --- a/client/changelog.html +++ b/client/changelog.html @@ -731,19 +731,54 @@ pre { } } CHANGELOG

-[1.8.2] - 2019-11-10

+[1.8.3] - 2019-11-10 +

+Added

    -
  • Fixed a duplicate button issue in reshape tab
    • +
  • Preview combos by hovering over recipes
    • +
  • Condensed recipe display
    • +
+

+Fixed

+
    +
  • Construct display on info / demo page
    • +
  • Case where a skill could send multiple ko events to target
    • +
  • Resizing of vbox when you buy / create certain items
    • +
+

+Changed

+
    +
  • Automatically shows a preview of combo item when you have 3 items selected for combining
    • +
  • Only highlight the first available item slot when equipping
    • +
  • Amplify no longer increase GreenPower
    • +
  • Purify +
      +
    • Now removes all effects on target
      • +
    • Applies "Purified" increasing healing taken
      • +
    +
    • +
  • Purge +
      +
    • Now removes all effects on target
      • +
    +
    • +
+

+[1.8.2] - 2019-11-10

+

+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.

-Changed

+Changed

  • Game phase

    @@ -794,7 +829,7 @@ pre {

    [1.8.0] - 2019-11-06

    -Added

    +Added

    • Drag and drop for vbox interactions can be used instead of single click / double click

      @@ -810,7 +845,7 @@ pre {

    -Changed

    +Changed

    • Construct life changed

      @@ -878,7 +913,7 @@ pre {

      [1.7.0] - 2019-10-31

      -Added

      +Added

      • Step by step tutorial

        @@ -896,7 +931,7 @@ pre {

      -Changed

      +Changed

      • Vbox phase

        @@ -1023,7 +1058,7 @@ pre {

        [1.6.6] - 2019-10-27

        -Added

        +Added
        • Offering of draws
            @@ -1035,14 +1070,14 @@ 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
            • Player width styling

            -Changed

            +Changed
            • Improved wiggle animation
            • Intercept is now considered defensive by bots
              • @@ -1051,14 +1086,14 @@ pre {

              [1.6.4] - 2019-10-24

              -Changed

              +Changed
              • Animations processing on client side reduced.

              [1.6.3] - 2019-10-23

              -Added

              +Added
              • MNNI: the MNML guide
                  @@ -1067,7 +1102,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.
                  • @@ -1078,7 +1113,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
                    • @@ -1088,12 +1123,12 @@ pre {

                    [1.6.0] - 2019-10-18

                    -Added

                    +Added
                    • Subscriber chat!

                    -Changed

                    +Changed

                    • Made available skill / effect information during the combat phase.

                      @@ -1117,7 +1152,7 @@ pre {

                    -Fixed

                    +Fixed
                    • Matchmaking bug where server matches you with yourself
                    @@ -1125,7 +1160,7 @@ pre { [1.5.6] - 2019-10-17

                    We've updated the UI during the vbox / buy phase to give a better indication of valid actions.

                    -Changed

                    +Changed

                    • Borders for skill combo's represent the base colours.

                      @@ -1151,7 +1186,7 @@ pre {

                      [1.5.5] - 2019-10-15

                      -Changed

                      +Changed

                      • Purge

                        From 576244a5417dab3b8061f53a869c1f3c28617aa8 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 19:10:54 +1000 Subject: [PATCH 5/5] version --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 0bfbd573..fe4e75fb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.2 \ No newline at end of file +1.8.3 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 3a0fffbb..18b68a3f 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.8.2", + "version": "1.8.3", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index a6fc3780..96747156 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.8.2", + "version": "1.8.3", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index e1198adc..654b3f8e 100644 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.8.2", + "version": "1.8.3", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 6461cc90..46acb90a 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.8.2" +version = "1.8.3" authors = ["ntr "] [dependencies]