external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,673 Commits 33 Branches 187 Tags
edabd66c9837f080ab52fe88ac76b05f5e627f85
Commit Graph

36673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamin W. Collins
487fec0258 multiplayer fix for 2nd and 3rd games of match 
The server was not updating the lobby player's game reference.  So, the
remote client's response was being processed for the wrong game
instance.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 16:03:48 -07:00
Hanmac
b25bc72f3e CardFactory: fixed keywords for SplitCards 2018-02-19 21:37:16 +01:00
Jamin W. Collins
d086e4d692 cleanup remote client game state creation 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 13:23:07 -07:00
Jamin W. Collins
8d2d66abb9 move external address out to a class attribute 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 13:23:07 -07:00
tehdiplomat
6ca1269261 Add ability to load tokens via scripts before 2018-02-19 13:15:12 -05:00
Chris H
d374da0481 Refactor TokenEffect to be easier to add in TokenScripts 2018-02-19 13:15:12 -05:00
Agetian
83242e1fa9 - More cleanup. 2018-02-19 20:56:05 +03:00
Agetian
35fa4e7d8f - More cleanup. 2018-02-19 20:50:45 +03:00
Agetian
5022e96a48 - More cleanup. 2018-02-19 20:50:09 +03:00
Agetian
1779c8f84e - More cleanup and Price of Progress logic fix. 2018-02-19 20:15:12 +03:00
Michael Kamensky
74d9791f03 Merge branch 'ScorchedEarth' into 'master' 
Scorched earth

See merge request core-developers/forge!234
 2018-02-19 16:52:41 +00:00
Michael Kamensky
a6cb96c758 Merge branch 'BattleCry' into 'master' 
Gerrard's Battle Cry : play before combat

See merge request core-developers/forge!235
 2018-02-19 16:51:59 +00:00
Agetian
b05463ad6c - Code base cleanup. 2018-02-19 19:48:06 +03:00
Seravy
f229fbc4b1 Update DestroyAi.java 2018-02-19 12:54:16 +00:00
Seravy
1d470f87d4 Gerrard's Battle Cry : play before combat 2018-02-19 12:55:59 +01:00
Michael Kamensky
8c680da98c Merge branch 'PriceOfProgress' into 'master' 
Price of progress

See merge request core-developers/forge!210
 2018-02-19 04:37:54 +00:00
Michael Kamensky
21e682f54d Merge branch 'deck-editor' into 'master' 
improve how foiling is done

See merge request core-developers/forge!233
 2018-02-19 04:27:28 +00:00
Seravy
70593c2b6a Try to play Scorching Earth before playing a land for higher X. 2018-02-18 23:35:44 +01:00
Seravy
6b64667767 Do not spend more on X than the number of lands we can discard! 2018-02-18 21:37:20 +01:00
Hanmac
96d1777132 ChangeZoneEffect: it should Fizzle when removing to Command zone too 2018-02-18 20:58:12 +01:00
Jamin W. Collins
f6bd725633 improve how foiling is done 
Previous implementation relied on the removed card becoming focused in
the full card inventory.  This implementation works directly with the
deck avoiding the full inventory.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-18 12:51:55 -07:00
Michael Kamensky
dd7e2d933f Merge branch 'DumpTurn' into 'master' 
Dump/Setup game state will now save current game turn.

See merge request core-developers/forge!209
 2018-02-18 19:39:22 +00:00
Seravy
97177e379e Default turn = 1 if none set 2018-02-18 20:22:17 +01:00
Seravy
8df00a18e8 This should be 0 2018-02-18 19:55:59 +01:00
Michael Kamensky
6668fa5505 Merge branch 'revert-a9e15c2d' into 'master' 
Revert "Merge branch 'Guavafix' into 'master'"

See merge request core-developers/forge!232
 2018-02-18 18:54:35 +00:00
Seravy
c348ffa34e Now using SVar 2018-02-18 19:54:29 +01:00
Michael Kamensky
275e1be6be Revert "Merge branch 'Guavafix' into 'master'" 
This reverts merge request !217
 2018-02-18 18:54:20 +00:00
austinio7116
8325893369 Error handling and thread timeout added to simulated matches to allow large AI tournaments without infinite length games due to loops. AI tournaments should now always finish - if the matches take too long they are scored as a draw. 2018-02-18 18:07:57 +00:00
austinio7116
66fd90332d Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-18 18:05:08 +00:00
austinio7116
4dad9e3478 Added model file for new commander deck generation and updated modern and standard models too 2018-02-18 18:01:09 +00:00
Hanmac
0c005bb3ff Commander: CommanderTax now is on the Player who casted the Commander 2018-02-18 18:47:59 +01:00
Hanmac
57b9a1b4c7 SpellAbility: copy manaPart 2018-02-18 18:07:41 +01:00
Hanmac
b29b1b3630 CardState: fixed copyState and LKI 2018-02-18 18:06:38 +01:00
Hanmac
3a071ea071 DestroyAi: extended havepact logic 2018-02-18 11:26:34 +01:00
Hanmac
25efe15329 fix final in ACEditor 2018-02-18 11:17:48 +01:00
Michael Kamensky
d544d69524 Merge branch 'AIInDangerRange' into 'master' 
AI In danger threshold now configurable and can be random instead of being locked to always 4.

See merge request core-developers/forge!220
 2018-02-18 09:15:34 +00:00
Michael Kamensky
bcc0fc9e00 Merge branch 'AINoncombatantCreatures' into 'master' 
Ai noncombatant creatures

See merge request core-developers/forge!221
 2018-02-18 09:10:39 +00:00
Seravy
7f2d2d6588 AI In danger threshold now configurable and can be random instead of being locked to always 4. 
(As a player, I find the fact the AI always changes their behavior towards more defensive at exactly 5 life extremely abusable - I can always be 100% sure they won't block certain creatures or activate certain spells/abilties otherwise, and in many cases, if the AI already got down to 5 life, even if they do activate their big trump card, it's too late : the last 5 damage is way easy to deal.)

Used this for playing the past few days and it seemed to work without problems.
 2018-02-18 10:08:29 +01:00
Michael Kamensky
2e70eb6718 Merge branch 'master' into 'master' 
- Minor cleanup.

See merge request core-developers/forge!230
 2018-02-18 08:59:38 +00:00
Agetian
b7601fded3 - Minor cleanup. 2018-02-18 11:59:10 +03:00
Michael Kamensky
13ace49230 Merge branch 'AISpiritMirror' into 'master' 
Ai spirit mirror

See merge request core-developers/forge!223
 2018-02-18 08:57:23 +00:00
Seravy
229ecc9ba7 missing an "s" in script 2018-02-18 09:39:18 +01:00
Seravy
602f761552 This should work? 2018-02-18 09:39:17 +01:00
Seravy
f271c7a74e Now the AI properly realizes this can be played, but doesn't actually play it. 
Is there something that prevents it from playing things that destroy own tokens?
 2018-02-18 09:39:15 +01:00
Seravy
c47242e40e fixed card name 2018-02-18 09:39:14 +01:00
Seravy
887f2f9a52 Mark Spirit Mirror and Breeding Pit tokens as things to sacrifice. 
If Grave Pact is in play, activate Spirit Mirror to destroy own token and force enemy to sac a creature if possible.
 2018-02-18 09:39:13 +01:00
Michael Kamensky
6b528a6d99 Merge branch 'DeckResetFixing' into 'master' 
Deck reset fixing

See merge request core-developers/forge!213
 2018-02-18 08:36:08 +00:00
Seravy
7ff8564077 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2018-02-18 09:35:39 +01:00
Michael Kamensky
77e79653ba Merge branch 'master' into 'master' 
- Minor cleanup and updating CHANGES.txt.

See merge request core-developers/forge!229
 2018-02-18 08:31:14 +00:00
Agetian
4665503caa - Minor cleanup and updating CHANGES.txt. 2018-02-18 11:29:02 +03:00