Commit Graph

2607 Commits

Author SHA1 Message Date
Hans Mackowiak
47d3a74387 Resolve "multiple StaticAbility Pump on same creature does conflict" 2019-09-14 16:33:56 +00:00
Ryan Wiedemann
3d51a6e962 Merge branch 'master' into 'start_trigger_run_params_refactor'
# Conflicts:
#   forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
2019-09-07 23:36:05 +00:00
Agetian
d11fc1b6fe - Rewire AI logic for AiAttackController. 2019-09-07 20:50:28 +02:00
Agetian
ad2565305f - Rewire the AI support for AttachAi and PumpAi 2019-09-07 20:50:28 +02:00
Hanmac
357f146742 CanBlockAny: rewrite for 'can block an additional' and 'can block any number' 2019-09-07 20:50:27 +02:00
Anthony Calosa
a0b71d60a1 Revert Android 8 codes to support older Android phones.
Hope I didn't miss any. :)
(tested with Android Marshmallow phone with 2gb RAM and mediatek cpu)
2019-09-07 22:54:53 +08:00
Anthony Calosa
00f263b2be Merge remote-tracking branch 'remotes/core/master' 2019-09-06 20:22:07 +08:00
Anthony Calosa
e977420ffa Finalization for Refactoring 2019-09-06 12:55:40 +08:00
Agetian
03be13bacf Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-09-06 07:45:57 +03:00
swordshine
19585aa007 Merge branch 'master' into 'master'
Refactor/Code Cleanup

See merge request core-developers/forge!2080
2019-09-06 00:41:16 +00:00
Anthony Calosa
59bf5830fe Big Cleanup 2019-09-06 00:03:04 +08:00
Anthony Calosa
efbd2a08eb Updated codes 2019-09-05 20:56:17 +08:00
Anthony Calosa
0f62a297c7 Updated some codes 2019-09-05 18:20:36 +08:00
Anthony Calosa
ca28b4d696 Merge remote-tracking branch 'remotes/core/master' 2019-09-05 18:01:47 +08:00
Ryan1729
9d2e92157c move and rename TriggerKey to AbilityKey 2019-09-04 22:53:32 -06:00
Ryan1729
ef5b7e902b rename runTrigger to runTriggerOld and add new runTrigger method 2019-09-03 22:52:38 -06:00
Blacksmith
10877ca143 [maven-release-plugin] prepare for next development iteration 2019-09-04 01:51:10 +00:00
Blacksmith
367dab571d [maven-release-plugin] prepare release forge-1.6.28 2019-09-04 01:51:04 +00:00
Anthony Calosa
efa606783c Cleanup 2019-09-03 22:13:35 +08:00
Anthony Calosa
a4d34bb858 Retained some schemas 2019-09-03 11:20:10 +08:00
Anthony Calosa
c38bae910a Refactor/Code Cleanup 2019-09-02 18:08:56 +08:00
Agetian
a7ee697d0f - Move a test outside the loop where it makes more sense 2019-09-02 10:28:50 +03:00
Hans Mackowiak
c04ccdaf7c Card: combine PT boost into one Map using timestamp 2019-09-01 05:39:09 +00:00
Michael Kamensky
b28cd601fd Fix AI inverse logic when resetting the paid hash before playing a SA 2019-08-24 05:51:32 +00:00
swordshine
47a1b6ea98 Merge branch 'patch' into 'master'
C19 cards

See merge request core-developers/forge!2042
2019-08-20 12:20:57 +00:00
Agetian
c823a493bb - Basic AI for payments via K'rrik's static ability. 2019-08-19 09:25:50 +03:00
swordshine
cf9256ddf8 Add Wall of Stolen Identity 2019-08-18 15:16:22 +08:00
Hans Mackowiak
1303991ee7 CostSacrifice: allow X as amount 2019-08-14 17:33:06 +00:00
Hans Mackowiak
581e05c01d EndCombatPhase: add way to end combat phase by effect 2019-08-13 05:35:29 +00:00
klaxnek
9aaaf93062 Fix variable memSet might not have been initialized 2019-08-10 14:07:03 +02:00
klaxnek
d04fae8e96 More SonarQube detected bugs fixed:
- Use try-with-resources in AutoCloseable objects.
- End this switch case with an unconditional break, return or throw statement.
- A "NullPointerException" could be thrown.
- Use the "equals" method if value comparison was intended.
- Correct this "&" to "&&".
2019-08-10 13:57:06 +02:00
Hans Mackowiak
f08432273c Manifest: add Choices 2019-08-10 10:44:53 +00:00
klaxnek
2534c2c27a Fixes some SonarQube detected bugs:
1. Use try-with-resources in AutoCloseable objects
2. Use the "equals" method if value comparison was intended.
3. Fixed getting the cheapest mana card in getCheapestPermanentAI.
2019-08-10 12:15:17 +02:00
Hanmac
773f2b280f Loyalty: use String Property for X 2019-08-01 21:16:07 +02:00
Hanmac
6cf5a08be2 Card: remove non hidden extrinsic keyword 2019-07-28 20:00:11 +02:00
Agetian
edbf3801f8 - Somewhat better logic for Risk Factor. 2019-07-22 19:50:56 +03:00
Hans Mackowiak
ef0af2d769 Woodland Champion: add ChangeZoneAll Trigger to Token Effects 2019-07-22 05:18:49 +00:00
swordshine
13b4fd2600 Fix getBestPlaneswalkerToDamage (new chandra's ultimate has a -X cost, which cannot be handled by the convertAmount method) 2019-07-21 16:26:36 +08:00
Hanmac
4182ad7395 DigEffect: remove AndOrValid 2019-07-14 05:59:04 +02:00
Agetian
f6ae65d901 - Basic AI support for DigMultipleEffect
- Reveal fix in DigMultipleEffect
2019-07-12 19:09:12 +03:00
Hanmac
371379def8 DigMultipleEffect: new effect for Kaalia 2019-07-11 07:18:42 +02:00
Hans Mackowiak
3ca71ccd7b - Basic AI for the revised Replicate and Conspire (will currently mimic the old behavior of paying as much as possible, to be improved) 2019-07-08 09:52:20 +00:00
Blacksmith
9a12564054 [maven-release-plugin] prepare for next development iteration 2019-07-08 00:55:54 +00:00
Blacksmith
118e86ec92 [maven-release-plugin] prepare release forge-1.6.27 2019-07-08 00:55:48 +00:00
swordshine
a2332addae Fix an AI cheat when using ExceptSelf logic 2019-06-30 22:56:12 +08:00
Agetian
3ef5e82c46 - Somewhat improve the AI for combat pumps coming from permanents 2019-06-21 20:49:30 +03:00
Agetian
12e3dd2198 - Improve the AI for combat pumps when it comes to timing the activation. 2019-06-21 18:55:57 +03:00
Agetian
769a3f6dd8 - Remove empty line. 2019-06-18 22:32:23 +03:00
Agetian
ecd48916c0 - Restore functionality for remove sickness and choose cards 2019-06-18 22:31:45 +03:00
Agetian
9831995db3 - Patch GameState to work with the latest changes. 2019-06-18 22:24:57 +03:00