ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.8.3' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.3

Browse Source
This commit is contained in:
ntr 2019-11-13 20:51:46 +11:00
commit dfcc281416
3 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -5,21 +5,20 @@
### Fixed ### Fixed
- Construct display on info / demo page - 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 ### Changed
- Automatically shows a preview of combo item when you have 3 items selected for combining - Automatically shows a preview of combo item when you have 3 items selected for combining
- Only highlight the first available item slot when equipping - Only highlight the first available item slot when equipping
- Amplify no longer increase GreenPower - Amplify no longer increase GreenPower
- Purify - Purify
- Now removes all effects on target - Now removes all effects on target
- Applies "Pure" increasing healing taken - Applies "Pure" increasing healing taken
- Purge - Purge
- Now removes all effects on target - Now removes all effects on target
## [1.8.2] - 2019-11-10 ## [1.8.2] - 2019-11-10
### Fixed ### Fixed
- Duplicate button issue in reshape tab - Duplicate button issue in reshape tab

75
client/changelog.html
View File

@ -731,19 +731,54 @@ pre {
} }
} }
</style><title>CHANGELOG</title></head><body><article class="markdown-body"><h2> </style><title>CHANGELOG</title></head><body><article class="markdown-body"><h2>
<a id="user-content-182---2019-11-10" class="anchor" href="#182---2019-11-10" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.2] - 2019-11-10</h2> <a id="user-content-183---2019-11-10" class="anchor" href="#183---2019-11-10" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.3] - 2019-11-10</h2>
<h3>
<a id="user-content-added" class="anchor" href="#added" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul> <ul>
<li>Fixed a duplicate button issue in reshape tab</li> <li>Preview combos by hovering over recipes</li>
<li>Condensed recipe display</li>
</ul>
<h3>
<a id="user-content-fixed" class="anchor" href="#fixed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Construct display on info / demo page</li>
<li>Case where a skill could send multiple ko events to target</li>
<li>Resizing of vbox when you buy / create certain items</li>
</ul>
<h3>
<a id="user-content-changed" class="anchor" href="#changed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>Automatically shows a preview of combo item when you have 3 items selected for combining</li>
<li>Only highlight the first available item slot when equipping</li>
<li>Amplify no longer increase GreenPower</li>
<li>Purify
<ul>
<li>Now removes all effects on target</li>
<li>Applies "Purified" increasing healing taken</li>
</ul>
</li>
<li>Purge
<ul>
<li>Now removes all effects on target</li>
</ul>
</li>
</ul>
<h2>
<a id="user-content-182---2019-11-10" class="anchor" href="#182---2019-11-10" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.2] - 2019-11-10</h2>
<h3>
<a id="user-content-fixed-1" class="anchor" href="#fixed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Duplicate button issue in reshape tab</li>
</ul> </ul>
<h2> <h2>
<a id="user-content-181---2019-11-09" class="anchor" href="#181---2019-11-09" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.1] - 2019-11-09</h2> <a id="user-content-181---2019-11-09" class="anchor" href="#181---2019-11-09" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.1] - 2019-11-09</h2>
<h3> <h3>
<a id="user-content-fixed" class="anchor" href="#fixed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3> <a id="user-content-fixed-2" class="anchor" href="#fixed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul> <ul>
<li>An issue where skills would not be put on cooldown after being used.</li> <li>An issue where skills would not be put on cooldown after being used.</li>
</ul> </ul>
<h3> <h3>
<a id="user-content-changed" class="anchor" href="#changed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-1" class="anchor" href="#changed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li> <li>
<p>Game phase</p> <p>Game phase</p>
@ -794,7 +829,7 @@ pre {
<h2> <h2>
<a id="user-content-180---2019-11-06" class="anchor" href="#180---2019-11-06" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.0] - 2019-11-06</h2> <a id="user-content-180---2019-11-06" class="anchor" href="#180---2019-11-06" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.0] - 2019-11-06</h2>
<h3> <h3>
<a id="user-content-added" class="anchor" href="#added" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3> <a id="user-content-added-1" class="anchor" href="#added-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul> <ul>
<li> <li>
<p>Drag and drop for vbox interactions can be used instead of single click / double click</p> <p>Drag and drop for vbox interactions can be used instead of single click / double click</p>
@ -810,7 +845,7 @@ pre {
</li> </li>
</ul> </ul>
<h3> <h3>
<a id="user-content-changed-1" class="anchor" href="#changed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-2" class="anchor" href="#changed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li> <li>
<p>Construct life changed</p> <p>Construct life changed</p>
@ -878,7 +913,7 @@ pre {
<h2> <h2>
<a id="user-content-170---2019-10-31" class="anchor" href="#170---2019-10-31" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.7.0] - 2019-10-31</h2> <a id="user-content-170---2019-10-31" class="anchor" href="#170---2019-10-31" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.7.0] - 2019-10-31</h2>
<h3> <h3>
<a id="user-content-added-1" class="anchor" href="#added-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3> <a id="user-content-added-2" class="anchor" href="#added-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul> <ul>
<li> <li>
<p>Step by step tutorial</p> <p>Step by step tutorial</p>
@ -896,7 +931,7 @@ pre {
</li> </li>
</ul> </ul>
<h3> <h3>
<a id="user-content-changed-2" class="anchor" href="#changed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-3" class="anchor" href="#changed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li> <li>
<p>Vbox phase</p> <p>Vbox phase</p>
@ -1023,7 +1058,7 @@ pre {
<h2> <h2>
<a id="user-content-166---2019-10-27" class="anchor" href="#166---2019-10-27" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.6] - 2019-10-27</h2> <a id="user-content-166---2019-10-27" class="anchor" href="#166---2019-10-27" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.6] - 2019-10-27</h2>
<h3> <h3>
<a id="user-content-added-2" class="anchor" href="#added-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3> <a id="user-content-added-3" class="anchor" href="#added-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul> <ul>
<li>Offering of draws <li>Offering of draws
<ul> <ul>
@ -1035,14 +1070,14 @@ pre {
<h2> <h2>
<a id="user-content-165---2019-10-25" class="anchor" href="#165---2019-10-25" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.5] - 2019-10-25</h2> <a id="user-content-165---2019-10-25" class="anchor" href="#165---2019-10-25" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.5] - 2019-10-25</h2>
<h3> <h3>
<a id="user-content-fixed-1" class="anchor" href="#fixed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3> <a id="user-content-fixed-3" class="anchor" href="#fixed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul> <ul>
<li>Stripe being blocked no longer causes unrecoverable error</li> <li>Stripe being blocked no longer causes unrecoverable error</li>
<li>Automatic ready up is now throttled after abandons</li> <li>Automatic ready up is now throttled after abandons</li>
<li>Player width styling</li> <li>Player width styling</li>
</ul> </ul>
<h3> <h3>
<a id="user-content-changed-3" class="anchor" href="#changed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-4" class="anchor" href="#changed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li>Improved wiggle animation</li> <li>Improved wiggle animation</li>
<li>Intercept is now considered defensive by bots</li> <li>Intercept is now considered defensive by bots</li>
@ -1051,14 +1086,14 @@ pre {
<h2> <h2>
<a id="user-content-164---2019-10-24" class="anchor" href="#164---2019-10-24" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.4] - 2019-10-24</h2> <a id="user-content-164---2019-10-24" class="anchor" href="#164---2019-10-24" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.4] - 2019-10-24</h2>
<h3> <h3>
<a id="user-content-changed-4" class="anchor" href="#changed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-5" class="anchor" href="#changed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li>Animations processing on client side reduced.</li> <li>Animations processing on client side reduced.</li>
</ul> </ul>
<h2> <h2>
<a id="user-content-163---2019-10-23" class="anchor" href="#163---2019-10-23" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.3] - 2019-10-23</h2> <a id="user-content-163---2019-10-23" class="anchor" href="#163---2019-10-23" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.3] - 2019-10-23</h2>
<h3> <h3>
<a id="user-content-added-3" class="anchor" href="#added-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3> <a id="user-content-added-4" class="anchor" href="#added-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul> <ul>
<li>MNNI: the MNML guide <li>MNNI: the MNML guide
<ul> <ul>
@ -1067,7 +1102,7 @@ pre {
</li> </li>
</ul> </ul>
<h3> <h3>
<a id="user-content-fixed-2" class="anchor" href="#fixed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3> <a id="user-content-fixed-4" class="anchor" href="#fixed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul> <ul>
<li>Fixed issue where dots / hots would not trigger when reapplied at a higher speed</li> <li>Fixed issue where dots / hots would not trigger when reapplied at a higher speed</li>
<li>Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.</li> <li>Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.</li>
@ -1078,7 +1113,7 @@ pre {
<h2> <h2>
<a id="user-content-162---2019-10-20" class="anchor" href="#162---2019-10-20" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.2] - 2019-10-20</h2> <a id="user-content-162---2019-10-20" class="anchor" href="#162---2019-10-20" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.2] - 2019-10-20</h2>
<h3> <h3>
<a id="user-content-fixed-3" class="anchor" href="#fixed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3> <a id="user-content-fixed-5" class="anchor" href="#fixed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul> <ul>
<li>Combiner bug where it would preview items for different combinations</li> <li>Combiner bug where it would preview items for different combinations</li>
<li>Skill descriptions are cleared when animations start</li> <li>Skill descriptions are cleared when animations start</li>
@ -1088,12 +1123,12 @@ pre {
<h2> <h2>
<a id="user-content-160---2019-10-18" class="anchor" href="#160---2019-10-18" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.0] - 2019-10-18</h2> <a id="user-content-160---2019-10-18" class="anchor" href="#160---2019-10-18" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.0] - 2019-10-18</h2>
<h3> <h3>
<a id="user-content-added-4" class="anchor" href="#added-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3> <a id="user-content-added-5" class="anchor" href="#added-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul> <ul>
<li>Subscriber chat!</li> <li>Subscriber chat!</li>
</ul> </ul>
<h3> <h3>
<a id="user-content-changed-5" class="anchor" href="#changed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-6" class="anchor" href="#changed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li> <li>
<p>Made available skill / effect information during the combat phase.</p> <p>Made available skill / effect information during the combat phase.</p>
@ -1117,7 +1152,7 @@ pre {
</li> </li>
</ul> </ul>
<h3> <h3>
<a id="user-content-fixed-4" class="anchor" href="#fixed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3> <a id="user-content-fixed-6" class="anchor" href="#fixed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul> <ul>
<li>Matchmaking bug where server matches you with yourself</li> <li>Matchmaking bug where server matches you with yourself</li>
</ul> </ul>
@ -1125,7 +1160,7 @@ pre {
<a id="user-content-156---2019-10-17" class="anchor" href="#156---2019-10-17" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.5.6] - 2019-10-17</h2> <a id="user-content-156---2019-10-17" class="anchor" href="#156---2019-10-17" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.5.6] - 2019-10-17</h2>
<p>We've updated the UI during the vbox / buy phase to give a better indication of valid actions.</p> <p>We've updated the UI during the vbox / buy phase to give a better indication of valid actions.</p>
<h3> <h3>
<a id="user-content-changed-6" class="anchor" href="#changed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-7" class="anchor" href="#changed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li> <li>
<p>Borders for skill combo's represent the base colours.</p> <p>Borders for skill combo's represent the base colours.</p>
@ -1151,7 +1186,7 @@ pre {
<h2> <h2>
<a id="user-content-155---2019-10-15" class="anchor" href="#155---2019-10-15" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.5.5] - 2019-10-15</h2> <a id="user-content-155---2019-10-15" class="anchor" href="#155---2019-10-15" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.5.5] - 2019-10-15</h2>
<h3> <h3>
<a id="user-content-changed-7" class="anchor" href="#changed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3> <a id="user-content-changed-8" class="anchor" href="#changed-8" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul> <ul>
<li> <li>
<p>Purge</p> <p>Purge</p>

14
server/src/skill.rs
View File

@ -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 { fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> Resolutions {
for Resolution { source, target, event, stages: _ } in resolutions.clone() { for Resolution { source: event_source, target: event_target, event, stages: _ } in resolutions.clone() {
let mut source = game.construct_by_id(source.id).unwrap().clone(); let mut source = game.construct_by_id(event_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 { match event {
Event::Damage { amount, skill, mitigation, colour: c } => { 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 {
// Make sure target ko is from this event
target.effects.clear(); target.effects.clear();
resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly)); resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly));
} }
game.update_construct(&mut source); game.update_construct(&mut source);
game.update_construct(&mut target); game.update_construct(&mut target);
if target.is_ko() {
// Don't loop for multiple resolutions which led to KO
break;
}
}; };
return resolutions; return resolutions;