external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,696 Commits 34 Branches 187 Tags
a9e3a2d9276c7afd59dbc0455b657bb8c23f056f
Commit Graph

39696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
a9e3a2d927 Merge branch 'fix-damagereceivedcond' into 'master' 
Fixed an issue which caused DamageReceivedCondition not to work and always return 0.

See merge request core-developers/forge!1219
 2018-12-13 19:04:02 +00:00
Michael Kamensky
f6bd4ca951 Merge branch 'master' into 'master' 
Minor code cleanup.

See merge request core-developers/forge!1222
 2018-12-13 19:03:25 +00:00
Agetian
7fd2a5fa04 - Code cleanup. 2018-12-13 22:02:17 +03:00
Michael Kamensky
92fc1b1061 Merge branch 'master' into 'master' 
A more reliable check for Valid Targeting in damage chaining.

See merge request core-developers/forge!1221
 2018-12-13 18:58:44 +00:00
Agetian
36154db24d - A more reliable check for Valid Targeting in damage chaining. 2018-12-13 21:57:01 +03:00
Michael Kamensky
cdd9c882fb Merge branch 'master' into 'master' 
Improve AI damage chaining for spells with restricted targeting

See merge request core-developers/forge!1220
 2018-12-13 17:08:49 +00:00
Agetian
3896a79cfa - Improve damage chaining so that the AI doesn't try to chain a spell with restricted targeting to a general use spell (e.g. a spell that targets only attacking creatures to a Lightning Strike outside of combat). 2018-12-13 20:08:01 +03:00
Michael Kamensky
8419eeea8f Merge branch 'quest-challenges-fix' into 'master' 
Fixed an issue with loading quest challenges from the wrong folder.

Closes #781

See merge request core-developers/forge!1217
 2018-12-13 12:56:45 +00:00
Agetian
ee960c9c08 - Fixed an issue which caused DamageReceivedCondition not to work and always return 0 (looks like it needs an internal LKI check). 2018-12-13 15:55:42 +03:00
Agetian
ec77e89516 - Fixed an issue with loading quest challenges from the wrong folder. 2018-12-13 13:25:10 +03:00
Michael Kamensky
8f10ff8016 Merge branch 'master' into 'master' 
Restore the "move equipment" functionality for the AI

See merge request core-developers/forge!1216
 2018-12-12 18:57:00 +00:00
Agetian
f09ec13428 - Restore the "move equipment" functionality for the AI 2018-12-12 21:54:14 +03:00
Michael Kamensky
32386f67fa Merge branch 'ai-damage-chaining' into 'master' 
Basic AI damage chaining

See merge request core-developers/forge!1211
 2018-12-12 18:31:00 +00:00
Michael Kamensky
c89996ad94 Merge branch 'clone-effect-flip' into 'master' 
Prevent a NPE on cloning a flipped card.

Closes #779

See merge request core-developers/forge!1215
 2018-12-12 18:30:43 +00:00
Agetian
f45bccf71d - chainDmg not null is already ensured on top 2018-12-12 20:40:26 +03:00
Agetian
adec6c720f - Removed a superfluous isAI check, handled inside getDamagingSAToChain (one more). 2018-12-12 20:39:49 +03:00
Agetian
9bcdfad726 - Removed a superfluous isAI check, handled inside getDamagingSAToChain. 2018-12-12 20:37:25 +03:00
Agetian
5db2dd74b8 - Prevent a NPE on cloning a flipped card, ensure that the original image is loaded after cloning if the card is not flipped. 2018-12-12 20:19:15 +03:00
Agetian
b718365a39 - getDamagingSAToChain should only work for actual AI players, not when simulating human decisions. 2018-12-12 19:42:28 +03:00
Agetian
7a7b461e0d - Set the damage chaining defaults for the AI profiles. 2018-12-12 14:41:39 +03:00
Agetian
7b6ad78ba2 - Don't use damage chaining for simulated AI. 2018-12-12 12:43:21 +03:00
Agetian
709e04d9ad - Don't try to chain a pump spell to a damage spell targeting a player. 2018-12-12 10:08:00 +03:00
Michael Kamensky
741da3bcc1 Merge branch 'revert-c5b1f6cf' into 'master' 
Revert "Merge branch 'fix-desecrated-tomb' into 'master'"

See merge request core-developers/forge!1213
 2018-12-12 06:14:46 +00:00
Michael Kamensky
99ba590676 Revert "Merge branch 'fix-desecrated-tomb' into 'master'" 
This reverts merge request !1212
 2018-12-12 06:14:32 +00:00
Agetian
4cbb50483a - Renamed a method. 2018-12-12 09:04:46 +03:00
Agetian
1b6b7f8af4 - Move chainDmg closer to where it's used, avoid calling it when not planning to cast the spell for other reasons. 2018-12-12 09:03:41 +03:00
Agetian
3b5015e9b6 - Moved the chain SA prediction routine to DamageDealAi, where it belongs more. 2018-12-12 08:57:23 +03:00
Agetian
789f9eecb4 - Maximize the chance to chain spells to kill threats when in danger (unless the option is disabled). 2018-12-12 08:54:31 +03:00
Agetian
8d3723d3c7 Merge remote-tracking branch 'origin/ai-damage-chaining' into ai-damage-chaining 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiCardMemory.java
#	forge-ai/src/main/java/forge/ai/AiController.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
 2018-12-12 08:48:02 +03:00
Agetian
95db50f07b - Renamed a few things for clarity. 2018-12-12 08:47:36 +03:00
Agetian
602226f416 - Removed a commented out line (mana is reserved elsewhere). 2018-12-12 08:14:41 +03:00
Agetian
0c5e5288b8 - Tweaking a method name. 2018-12-12 08:14:41 +03:00
Agetian
96f941aeae - Added an experimental AI property controlling damage chaining. 2018-12-12 08:14:41 +03:00
Agetian
c79ed8b609 - Basic implementation for chaining two damage spells, supports damage+damage or damage+debuff. 2018-12-12 08:14:41 +03:00
Michael Kamensky
c5b1f6cf61 Merge branch 'fix-desecrated-tomb' into 'master' 
Fixed Desecrated Tomb.

See merge request core-developers/forge!1212
 2018-12-12 05:13:53 +00:00
Agetian
ac01815837 - Fixed Desecrated Tomb. 2018-12-11 22:06:56 +03:00
Agetian
2b4838a15f - Removed a commented out line (mana is reserved elsewhere). 2018-12-11 21:06:59 +03:00
Agetian
45abd2f3c9 - Tweaking a method name. 2018-12-11 15:12:41 +03:00
Agetian
cb29ae319e - Added an experimental AI property controlling damage chaining. 2018-12-11 15:07:57 +03:00
Agetian
685a0daa71 - Basic implementation for chaining two damage spells, supports damage+damage or damage+debuff. 2018-12-11 15:07:57 +03:00
Michael Kamensky
5f3a0b3a62 Merge branch 'hollow-one-costreduction' into 'master' 
Attempting to fix Hollow One cost reduction

See merge request core-developers/forge!1209
 2018-12-11 12:06:57 +00:00
Agetian
16aca81508 - Added a TODO entry for future rework. 2018-12-11 13:54:33 +03:00
Michael Kamensky
c3a32bca0a Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_GRND (Guilds of Ravnica: How much damage can you deal?)

See merge request core-developers/forge!1210
 2018-12-11 10:52:26 +00:00
Agetian
5695e72950 - Added puzzle PS_GRND (Guilds of Ravnica: How much damage can you deal?) 2018-12-11 13:51:38 +03:00
Michael Kamensky
57f6ceb7f0 Merge branch 'ai-vaevictis' into 'master' 
Fixed Vaevictis Asmadi, the Dire AI targeting logic.

Closes #778

See merge request core-developers/forge!1208
 2018-12-11 05:46:56 +00:00
Agetian
366c836d3a - Make the local check for Hollow One work for static abilities only. 2018-12-11 08:38:37 +03:00
Agetian
35a7af2a5e - Fixed Hollow One cost reduction (currently uses a fixed check on PropertyYou, not sure how to make it work better since it's not coming from a SpellAbility with checkable activator). 2018-12-11 08:36:59 +03:00
Agetian
d362f275e5 - More logic for Vaevictis, moved the relevant logic to SacrificeAi for clarity, only called from Pump now. 2018-12-11 08:35:01 +03:00
Agetian
9fec411bd5 - More logic for Vaevictis. 2018-12-10 20:24:53 +03:00
Agetian
ec1566f169 - Somewhat more detailed logic for allied sac on Vaevictis. 2018-12-10 20:02:38 +03:00