external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,339 Commits 31 Branches 187 Tags
16f043f6a19a4623f3748198a15c968b6a14ef0c
Commit Graph

52339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
a2a2c11e4b more TargetsValid fixes 2021-07-25 17:52:13 +02:00
Hans Mackowiak
8caf3fdcbf fix Orvar the all Form: should only trigger on battlefield targets 2021-07-25 17:46:28 +02:00
Hans Mackowiak
c92d1812fd fix The Prismatic Bridge: rest in random order 2021-07-25 17:37:03 +02:00
Hans Mackowiak
90791a7184 Merge branch 'wurm' into 'master' 
wurmcoil_engine.txt consolidate token lines

See merge request core-developers/forge!5108
 2021-07-25 15:29:21 +00:00
Northmoc
ad9371b4af wurmcoil_engine.txt consolidate token lines 2021-07-25 07:58:39 -04:00
tool4EvEr
8a80a39416 CounterEffect: fix missing trigger 2021-07-25 13:11:51 +02:00
leriomaggio
cc3cafa964 Added Docstring for test documentation 2021-07-25 11:17:57 +01:00
leriomaggio
e803899d6a Renamed param in constructor for artPreference and BUG FIX in load unknown Card 
Even if UNKNOWN card load is enabled, we should check whether the card was not found because of originally filtered.

Therefore, the actual UNKNOWN card will be added now ONLY IF it is not contained in the filtered Blacklist.
 2021-07-25 11:17:37 +01:00
Michael Kamensky
6dcad6fad0 Merge branch 'AFC_Fiendlash' into 'master' 
Added Fiendlash for review

See merge request core-developers/forge!5061
 2021-07-25 09:31:05 +00:00
leriomaggio
1fecdd255a Simplified attemptToLoadCard by removing extra unused setCode param 2021-07-25 08:45:48 +01:00
leriomaggio
e28f6cf16f Removed useless param from attemptLoadCard 2021-07-25 08:44:22 +01:00
leriomaggio
c8e3eef7cf Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-25 08:09:22 +01:00
leriomaggio
2d189cda9a Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-25 08:09:09 +01:00
Michael Kamensky
ba7f08d5ec Merge branch 'tokenset' into 'master' 
Some improvements to token image fetching (especially emblems)

See merge request core-developers/forge!5105
 2021-07-25 04:27:44 +00:00
Northmoc
222448d29c Add extra try for "setless" token image (Desktop) 2021-07-24 13:06:47 -04:00
Northmoc
377cbca39b Add extra try for "setless" token image (Android) 2021-07-24 13:06:13 -04:00
Northmoc
97225782c1 Emblems - common rarity 2021-07-24 13:05:06 -04:00
Northmoc
8b96079f6e EffectEffect add set to Emblem imagekey 2021-07-24 13:04:27 -04:00
Michael Kamensky
921369628b Merge branch 'dealdamage' into 'master' 
Fix dealDamage ignoring amount changes

See merge request core-developers/forge!5104
 2021-07-24 16:42:44 +00:00
tool4EvEr
2480296113 Fix dealDamage ignoring amount changes 2021-07-24 14:15:52 +02:00
leriomaggio
d9620a5556 TEMP implementation of Smart Card Art Selection method 2021-07-24 11:33:37 +01:00
leriomaggio
56080cdf3f Added support to the new Smart Card Art Preference Option 
The new "Smart Card Art Selection" option for card images in deck has been added.
The Ui and forge preferences have been updated (default is False), as well as corresponding support in StaticData.
On this note, the old `getAlternativeCardPrint` has been re-implemented to enforce a "Latest_Art" based preference selection so that editions could be selected accordingly (as the smart method was originally designed)

Actual implementation of the method will be part of future commits as still under dev - and requires better encapsulation
 2021-07-24 11:07:20 +01:00
leriomaggio
6277bc0c0f Added note on behaviour for candidate w/ no edition 
Left note only for (internal) documentation purposes!
 2021-07-24 11:02:05 +01:00
leriomaggio
ec89ff755b more robust and reliable method to check for card images 
The getImagefile will be invoked since this method will also account for any difference in `full` and `fullborder` naming for card images.
In particular, it will try everything possible before giving up and assume the card has no image.
This is **crucial** for cardDB card retrieval, as well as determines the boolean value returned by PaperCard.hasImage method/property
 2021-07-24 10:51:26 +01:00
leriomaggio
4c001b9462 Nothing serious - explicit null initialisation 2021-07-24 10:48:08 +01:00
Bug Hunter
3b357207a4 Merge branch 'import' into 'master' 
Fix imports

See merge request core-developers/forge!5103
 2021-07-24 09:27:39 +00:00
tool4EvEr
ac6219f4bd Clean up 2021-07-24 11:27:37 +02:00
leriomaggio
513eed297d removed annoying blank line in code formatting :D 2021-07-24 10:09:41 +01:00
Wendell Wilkerson
c70ab7b722 fix for LKI on DamageDoneOnce trigger 2021-07-24 00:22:48 -05:00
Michael Kamensky
004ea04a0e Merge branch 'move-fatpacks-to-editions' into 'master' 
Move fatpacks to editions

See merge request core-developers/forge!5102
 2021-07-24 05:18:05 +00:00
Michael Kamensky
2b342d7118 Merge branch 'dungeon' into 'master' 
Add Dungeon to EditionSectionWithCollectorNumbers

See merge request core-developers/forge!5099
 2021-07-24 05:17:57 +00:00
Michael Kamensky
5645f2212e Merge branch 'predict' into 'master' 
Fix predictDamageTo

See merge request core-developers/forge!5100
 2021-07-24 05:17:23 +00:00
Michael Kamensky
e5cb062644 Merge branch 'anger' into 'master' 
Fix ReplaceDyingDefined on cards that use DamageAll effect

Closes #1938

See merge request core-developers/forge!5097
 2021-07-24 05:17:14 +00:00
Michael Kamensky
4bce4a9a84 Merge branch 'thirst' into 'master' 
Bloodchief's Thirst: improve StackDescription to show target when kicked (band-aid)

See merge request core-developers/forge!5101
 2021-07-24 05:16:21 +00:00
Wendell Wilkerson
8a6a0c5d85 Merge branch 'master' into AFC_Fiendlash 2021-07-23 23:51:23 -05:00
friarsol
da0f7ed15e Include D&D set 2021-07-23 22:49:32 -04:00
friarsol
6210fdd9fc Move FatPacks to editions file 2021-07-23 22:47:48 -04:00
Northmoc
610fe7fada - typo 2021-07-23 20:45:29 -04:00
Northmoc
4108b56135 serpentine_spike.txt tidy up StackDesc 2021-07-23 20:40:37 -04:00
tool4EvEr
1534636a64 Fix Serpentine Spike 2021-07-23 20:24:17 -04:00
Northmoc
94da5f3c3a add Remember objects from Damage effects to GameAction before the maps are cleared 2021-07-23 20:24:16 -04:00
Northmoc
a8205192ca remove Remember functions from DamageAllEffect 2021-07-23 20:24:09 -04:00
Northmoc
22337e4a7b remove Remember functions from DamageDealEffect 2021-07-23 20:21:18 -04:00
tool4EvEr
ffb40f1195 Fix Price of Loyalty 2021-07-24 00:09:52 +02:00
leriomaggio
01d117b07e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-23 22:38:23 +01:00
leriomaggio
b3ce4bf9ff New Options for Smart Card Art Selection 2021-07-23 22:38:19 +01:00
tool4EvEr
df160a751e Fix predictDamageTo 2021-07-23 21:56:37 +02:00
tool4EvEr
911511d039 Add Dungeon to EditionSectionWithCollectorNumbers 2021-07-23 21:33:25 +02:00
leriomaggio
f52dbdb996 Requires Restart for Preferred Art was set to the wrong label 2021-07-23 20:01:23 +01:00
leriomaggio
7d2a62714c Removed repeated/duplicate entries 2021-07-23 19:43:52 +01:00