Skip to content
Permalink
Browse files

Merge pull request #4942 from kendrick-walls-work/bfa-dev

#2775 - updated mistweaver flask for patch 8.2.5
  • Loading branch information...
Hinalover committed Sep 11, 2019
2 parents 22ce7d5 + c12548b commit 4a155a4dbc37f370de20f7b06df6039a7cb96816
Showing with 10 additions and 3 deletions.
  1. +6 −1 .travis.yml
  2. +1 −1 engine/class_modules/sc_demon_hunter.cpp
  3. +3 −1 engine/class_modules/sc_monk.cpp
@@ -32,6 +32,10 @@ addons:
- libcurl3
- libcurl4-gnutls-dev

osx_image:
- xcode8.3
- xcode10

#env:
# Each line is a separate build in the build matrix. A build in the build
# matrix is defined by the environment variables defined on the line, which
@@ -47,7 +51,8 @@ matrix:

before_install:
# Install bats on OSX through brew
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install bats; fi
# retry via travis_retry because brew sometimes hangs
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_retry brew update && travis_retry brew install bats; fi

notifications:
irc:
@@ -586,7 +586,7 @@ class demon_hunter_t : public player_t
void combat_begin() override;
demon_hunter_td_t* get_target_data( player_t* target ) const override;
void interrupt() override;
double resource_gain( resource_e, double, gain_t* g = nullptr, action_t* a = nullptr );
double resource_gain( resource_e, double, gain_t* g = nullptr, action_t* a = nullptr ) override;
void recalculate_resource_max( resource_e ) override;
void reset() override;
void merge( player_t& other ) override;
@@ -9500,7 +9500,9 @@ std::string monk_t::default_flask() const
return "disabled";
break;
case MONK_MISTWEAVER:
if ( true_level > 110 )
if ( true_level > 119 )
return "greater_flask_of_endless_fathoms"; // lvl 120 should use best flask
else if ( true_level > 110 )
return "endless_fathoms";
else if ( true_level > 100 )
return "whispered_pact";

0 comments on commit 4a155a4

Please sign in to comment.
You can’t perform that action at this time.