external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,480 Commits 31 Branches 187 Tags
d2d955143f477f727b51df0712ed1b988b1d35c0
Commit Graph

7816 Commits

Author SHA1 Message Date
Hans Mackowiak
4d7e41a9d7 Update StaticAbilityContinuous.java (#3227) 2023-06-09 18:33:15 +03:00
tool4ever
ba1d3fbe43 Clean up (#3225) 2023-06-09 11:47:59 +00:00
Hans Mackowiak
8f1100dff3 Amass type (#3222) 
* AmassEffect: add Type parameter

* fix AmassAi

* update editions tokenscripts

* Update AmassEffect.java

early return if no Army could be created
 2023-06-09 12:56:46 +03:00
Hans Mackowiak
a7c0d41064 LKICopy Transform and flip (#3146) 
* LKICopy Transform and flip

* Update CardUtil.java

Fix newCopy state when flipped or transformed

* Update CardUtil.java

fix backside

* Update CardUtil.java

add EffectSource

* CardStateName.Transformed needs to be copied

* Fixes #3201 somewhat

* Fix CardState for Fused Spells

* GameSimulationTest: Add Ratadrabik + TDFC token test
 2023-06-06 13:43:40 +03:00
Anthony Calosa
6cb2f6ce04 Merge pull request #3205 from tool4ever/fixes 
Fix NPE
 2023-06-05 06:10:55 +08:00
tool4EvEr
7304b37bce Clean up 2023-06-04 23:30:55 +02:00
tool4EvEr
2dde1f88a5 Fix NPE 2023-06-04 23:30:14 +02:00
tool4EvEr
2b0072ec09 Cleanup more ResolvingChecks 2023-06-04 12:25:03 +02:00
Anthony Calosa
b2d154e0eb Merge pull request #3195 from tool4ever/tweakresolve 
Follow-up tweak for when triggers are checked during resolve
 2023-06-04 09:29:17 +08:00
tool4EvEr
ab33b81047 Clean up 2023-06-03 22:22:44 +02:00
tool4EvEr
2ec35f7629 Follow-up tweak for when triggers are checked during resolve 2023-06-03 22:20:31 +02:00
tool4ever
65d385d531 Fix DeckHints only finding SimpleKeyword (#3191) 
* Fix DeckHints only finding SimpleKeyword

* Reveal clash correctly

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-06-03 13:58:23 +03:00
jjayers99
d6f5bf20f4 Adventure tavern events initial implementation 2023-05-31 00:00:21 -04:00
Anthony Calosa
85cfdfca4d Merge pull request #3150 from leriomaggio/formats/pauper 
Chaning Pauper as Sanctioned format
 2023-05-28 19:03:57 +08:00
tool4ever
b02bccc012 Fix Freeze (#3163) 2023-05-28 08:02:15 +00:00
tool4ever
9105d2de4e Fix Containment Priest exiling itself (#3161) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2023-05-27 16:10:04 +03:00
tool4EvEr
d4030e0f1d Treat replaceAbilityText bandaids 2023-05-25 22:13:03 +02:00
Anthony Calosa
c0d7788aee update 2023-05-25 10:26:45 +08:00
Anthony Calosa
6fc7df840d prevent NPE 2023-05-25 10:17:09 +08:00
Anthony Calosa
fc944ce41b Merge pull request #3031 from Northmoc/mat_tranquil 
MAT: tranquil_frillback.txt + support/related
 2023-05-25 06:08:20 +08:00
Valerio Maggio
d98d7b15d0 Merge remote-tracking branch 'upstream/master' into formats/pauper 2023-05-24 03:43:46 +01:00
Anthony Calosa
29317d6b83 Merge pull request #3139 from Card-Forge/spellCopyHostFull 
CardFactory: copySpellHost uses getCloneStates
 2023-05-23 06:13:35 +08:00
Valerio Maggio
3d5ab82cc5 Merge remote-tracking branch 'upstream/master' into formats/pauper 2023-05-20 14:06:35 +01:00
Hans Mackowiak
96b020a759 CardFactory: copySpellHost uses getCloneStates 2023-05-20 13:03:09 +02:00
tool4EvEr
987f61d43a Fix ChoosePlayerOrPlaneswalker vs. Battles 2023-05-20 12:16:58 +02:00
tool4EvEr
e5293e0aed Revert bad fix 2023-05-20 11:54:28 +02:00
tool4EvEr
15593508d6 Fix infinite loop if nothing to discard 2023-05-20 11:51:28 +02:00
tool4EvEr
3f418f1824 Fix StackOverflow 2023-05-20 08:01:04 +02:00
TRT
067780f16e Fix Nahiri 2023-05-20 08:01:03 +02:00
TRT
a54513e53d Fix extrinsic Jump-start not exiling 2023-05-20 08:01:00 +02:00
Hans Mackowiak
e3127b4dd5 KeywordInstance: store the idx to use it later (#3138) 2023-05-19 20:25:25 +03:00
tool4ever
6de7dd6bcc Use current shard when trying to pay with combo mana (#3130) 
* Use current shard when trying to pay with combo mana
 2023-05-18 07:21:08 +00:00
Valerio Maggio
fed5bf7f0c Added new Pauper format getter in GameFormat 2023-05-17 17:27:13 +01:00
Valerio Maggio
7500a83fc3 Officially introducing Pauper as Sanctioned (Subtype) format 2023-05-17 14:44:13 +01:00
Agetian
38990aff32 Battle AI support + improve Battle mechanics support (#3107) 
* - First draft of (very sketchy) Battle AI code.

* - Imports fix.

* - Slightly cleaner refreshCombatants.

* - Update Combat to allow the protecting player to participate in declaring blocks to defend a battle.

* - Update AiBlockController in order to allow the AI to participate in defending battles it's protecting.

* Clean up

* - Minor cleanup.

* Fix checking backside

* Add TODO

* Fix missing combat removal

* - Suggested minor cleanup.

* - Fix imports.

* - Improve support for battles in getAllPossibleDefenders.

* - AI: prefer own Battles before choosing allied Battles.

* Fix ClassCastException

---------

Co-authored-by: TRT <>
 2023-05-15 19:56:31 +03:00
Simisays
15a2ccb9f3 WHO The Lux Foundation Library (#3113) 
* update

* Update CardType.java

* update
 2023-05-15 09:15:41 +03:00
Anthony Calosa
c719260f0b Merge pull request #3106 from leriomaggio/formats/premodern 
Officially Introducing PREMODERN as Core Format in Forge
 2023-05-15 05:16:21 +08:00
Anthony Calosa
8f22cbf168 Merge pull request #3108 from Simisays/ZEDRUUFINAL 
Adventure: Zedruu dungeon and much more
 2023-05-15 05:07:52 +08:00
Valerio Maggio
74e1d5e051 Added new method in GameFormat API for future support of new core format. 2023-05-14 17:49:08 +01:00
Valerio Maggio
b182eb11d2 Merge branch 'Card-Forge:master' into formats/premodern 2023-05-14 09:09:05 +01:00
Anthony Calosa
874db2eea4 update Shared Fate 2023-05-14 07:15:35 +08:00
Simisays
762262a702 Squashed commit of the following: 
commit 1e02153c41b7649a601e6f18131d1a6c07004cc4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 13 20:41:25 2023 +0200

    update

commit 3888a72b8e4a3df88d3450014ce61de716381952
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 13 19:14:24 2023 +0200

    update

commit 130a30353517b02e05be4e8025ea0d882dd1a5f3
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 13 10:12:37 2023 +0200

    Squashed commit of the following:

    commit d8ed8583fe8c25126d7258d09b1b11ab4af9b803
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat May 13 10:11:42 2023 +0200

        update

    commit 6e6679fe093dafd645f7c89f145f55e0d8aaa706
    Merge: da383240ff c6c9bc75be
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat May 13 09:31:15 2023 +0200

        Merge remote-tracking branch 'upstream/master' into zedruu

    commit c6c9bc75be
    Merge: 612d325580 c93de35a3f
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 11:35:08 2023 +0800

        Merge pull request #3103 from jjayers99/master

        Adventure gate texture fix

    commit c93de35a3f
    Merge: c86a38a22f 612d325580
    Author: TabletopGeneral <56438137+jjayers99@users.noreply.github.com>
    Date:   Fri May 12 23:26:54 2023 -0400

        Merge branch 'Card-Forge:master' into master

    commit c86a38a22f
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Fri May 12 23:24:39 2023 -0400

        Adventure gate texture fix

    commit 612d325580
    Merge: f3f6dbce94 d64cd05704
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 10:53:22 2023 +0800

        Merge pull request #3102 from kevlahnota/newmaster2

        allow loading old save

    commit d64cd05704
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 10:50:57 2023 +0800

        allow loading old save

    commit f3f6dbce94
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 09:03:09 2023 +0800

        update images

    commit 6a8432f7a6
    Merge: c399799910 52d52b7bf8
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Sat May 13 08:45:42 2023 +0800

        Merge pull request #3093 from jjayers99/master

        Adventure mode content

    commit c399799910
    Author: paulsnoops <paulhammerton1@hotmail.co.uk>
    Date:   Fri May 12 19:17:01 2023 +0100

        Migrate card scripts: MOM, MOC, MAT

    commit a3bde0ed95
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Fri May 12 23:51:29 2023 +0800

        Fix cost

    commit b7339cbd02
    Author: Anthony Calosa <anthonycalosa@gmail.com>
    Date:   Fri May 12 23:48:25 2023 +0800

        Update jaheira_harper_emissary.txt

    commit 107e2e5a7e
    Author: Hans Mackowiak <hanmac@gmx.de>
    Date:   Fri May 12 17:31:11 2023 +0200

        Update invasion_of_new_capenna_holy_frazzle_cannon.txt

        fixed "YouCtrl"

    commit da383240ff9f1a74750e5b6956779184759bf4e8
    Merge: a857d087ec a98ae15af9
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri May 12 16:26:34 2023 +0200

        Merge remote-tracking branch 'upstream/master' into zedruu

    commit a857d087ecbdd942fad48a517994325453ac2b85
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri May 12 16:26:22 2023 +0200

        update

    commit 436f66342448eb74e6557b710d5b7c97f96aabe6
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Thu May 11 23:14:04 2023 +0200

        update

    commit 52d52b7bf8
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Thu May 11 15:22:58 2023 -0400

        Adventure image updates, dialog logic corrections

    commit d3635a7068f0c419739208805fa0cc826c9af3aa
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Thu May 11 20:07:06 2023 +0200

        update

    commit 8b1af31b8b174aa93bb022408203b1e6d6d9ff4d
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Thu May 11 09:36:40 2023 +0200

        update

    commit d88acb262f
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Thu May 11 00:51:18 2023 -0400

        Moved swamp town Shard Trader

    commit 9f716afdda
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Thu May 11 00:40:33 2023 -0400

        Update pixie_dimir.atlas

    commit f5e062d06d
    Author: jjayers99 <56438137+jjayers99@users.noreply.github.com>
    Date:   Wed May 10 23:55:55 2023 -0400

        Adventure mode content

        Preview release of Liliana dungeon
        Autosave when entering POI
        Improved POI enemy pathing (slightly)
        Addition of Portal mechanics
        Rework of Death Ring
        Increased land quantity in basic land shops
        Removed problematic objective from quest "(Almost) Open for Business"

    commit b3b84248dc59f308fe86c356eacfff6809be2a15
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:25:00 2023 +0200

        Update items.json

    commit 38986a4c0cf91aa3055994c1b0fb6f56487cbefa
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:24:47 2023 +0200

        Update enemies.json

    commit 96775b13aa00ea04ab2f5d92362ef221f6b18e71
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:20:04 2023 +0200

        Update items.atlas

    commit b8bf428231edf3e8d95b5c64129c8a664e5ea896
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 10:15:34 2023 +0200

        Update zedruu_boss_effect.txt

    commit 793db9f71a0fd9874b37fb7e390bcf76380337fd
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:54:34 2023 +0200

        Add files via upload

    commit de303b67b56b3cadb143decb7840400c4393464d
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:49:57 2023 +0200

        Add files via upload

    commit 2e06047604da89c1575c9b957b2fe5cd4e00cd3c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:26:53 2023 +0200

        Delete mineleader_boss_effect.txt

    commit 70c462f6d7899b447930bcc9d227c97dcca199d3
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:24:14 2023 +0200

        Update jaces_signature_hoodie.txt

    commit ab10796f3c49ee19892e4d60d05c65411e668deb
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:22:54 2023 +0200

        Update insect.dck

    commit 1906b21000fb2ea08fafa8b9f4dab7f2a6ae4e95
    Merge: 609aae7ec6 6437fde0c3
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Wed May 10 09:20:36 2023 +0200

        Merge branch 'Card-Forge:master' into zedruu

    commit 609aae7ec68793e7bee9818c9e7d6c4562775902
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue May 9 20:24:55 2023 +0200

        update

    commit a43d9447650e068b539f451eaf6909cc42ddbb0e
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun May 7 19:54:53 2023 +0200

        Adventurezedru (#11)

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

        * update

commit 86fe525c2b98f22d54caf4a40a20204fd2f50b9f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 12 22:07:03 2023 +0200

    update
 2023-05-13 20:42:20 +02:00
Valerio Maggio
876be0d9d5 Premodern is now a CORE FORMAT + new methods in Collection 
New methods have been added to GameFormat.Collection to get selected lists of available game formats. Moreover, a new method to get a map of all formats per FormatType has been added
(will be used in the revised "Formats" filter that is currently in progress).
 2023-05-13 17:38:27 +01:00
Anthony Calosa
2d301890bf Merge pull request #3104 from tool4ever/quicksilverfix 
Quicksilver Elemental shouldn't look at the recent state to gain abilities
 2023-05-13 19:31:34 +08:00
TRT
96e5e06b86 Fix Quicksilver Elemental 2023-05-13 10:36:53 +02:00
TRT
f309000e99 Fix Martyrdom 2023-05-13 10:31:10 +02:00
Anthony Calosa
4683803cdb Merge pull request #3101 from tool4ever/changedtext 
Tweak TextChange transformation
 2023-05-13 16:10:33 +08:00
TRT
eed1220c31 Tweak TextChange transformation 2023-05-12 22:14:26 +02:00
Anthony Calosa
a98ae15af9 Merge pull request #3097 from kevlahnota/newmaster2 
update Specialize ImageKey
 2023-05-12 20:48:51 +08:00
Anthony Calosa
e4366fb888 add specialized button on CardZoom 2023-05-12 19:59:52 +08:00