Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Vitty85
2019-09-06 08:38:04 +02:00
committed by GitHub
parent 2c62cfd487 a27216c317
commit 7a529bac6d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -1,4 +1,5 @@
language: cpp language: cpp
dist: trusty
branches: branches:
except: except:
- latest-master - latest-master
@@ -9,9 +10,9 @@ before_install:
- export BUILD_Qt=YES - export BUILD_Qt=YES
- export BUILD_MAC=NO - export BUILD_MAC=NO
# Only building on Mac when not handling pull request # Only building on Mac when not handling pull request
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then # - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
export BUILD_MAC=YES; # export BUILD_MAC=YES;
fi # fi
- sudo apt-get update -qq - sudo apt-get update -qq
# Building for PSP here # Building for PSP here
- if [ "$BUILD_PSP" == "YES" ]; then - if [ "$BUILD_PSP" == "YES" ]; then
@@ -33,7 +34,7 @@ before_install:
export ANDROID="android-sdk-linux/tools/android" && export ANDROID="android-sdk-linux/tools/android" &&
if [ `uname -m` = x86_64 ]; then if [ `uname -m` = x86_64 ]; then
sudo dpkg --add-architecture i386 && sudo apt-get update && sudo dpkg --add-architecture i386 && sudo apt-get update &&
sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq; fi && sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; fi &&
wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv &&
wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv; wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv;
fi fi
@@ -48,6 +49,7 @@ install:
$ANDROID list sdk --extended -a && $ANDROID list sdk --extended -a &&
echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https; echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https;
fi fi
- sudo python -m easy_install --upgrade pyOpenSSL
- sudo pip install pyjavaproperties - sudo pip install pyjavaproperties
- sudo pip install github3.py - sudo pip install github3.py
- sudo pip install cpp-coveralls - sudo pip install cpp-coveralls

2
projects/mtg/bin/Res/test/_tests.txt
View File

@@ -264,7 +264,6 @@ dauntless_escort.txt
dauthi_embrace.txt dauthi_embrace.txt
dawn_of_the_dead.txt dawn_of_the_dead.txt
deadshot.txt deadshot.txt
death_grasp.txt
death_ward.txt death_ward.txt
decree_of_justice.txt decree_of_justice.txt
defense_of_the_heart.txt defense_of_the_heart.txt
@@ -739,5 +738,4 @@ momir/overcost.txt
######################## ########################
#AI Tests #AI Tests
######################## ########################
ai/goblin_artillery.txt
ai/proliferate_simple.txt ai/proliferate_simple.txt

6
projects/mtg/src/MTGAbility.cpp
View File

@@ -4574,11 +4574,11 @@ int AbilityFactory::abilityEfficiency(MTGAbility * a, Player * p, int mode, Targ
if (AAMover * aam = dynamic_cast<AAMover *>(a)) if (AAMover * aam = dynamic_cast<AAMover *>(a))
{ {
MTGGameZone * z = aam->destinationZone(target); MTGGameZone * z = aam->destinationZone(target);
if ((tc && tc->targetsZone(p->game->library)) || (tc && tc->targetsZone(p->game->graveyard)) || (tc && tc->targetsZone(p->game->hand))) if ((tc && tc->targetsZone(p->game->library)) || (tc && tc->targetsZone(p->game->graveyard)) || (tc && tc->targetsZone(p->game->hand)))
{ {
if (z == p->game->hand || z == p->game->inPlay) if (z == p->game->hand || z == p->game->inPlay)
return BAKA_EFFECT_GOOD; return BAKA_EFFECT_GOOD;
} }
return BAKA_EFFECT_BAD; //TODO return BAKA_EFFECT_BAD; //TODO
} }