external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 32 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

8293 Commits

Author SHA1 Message Date
Anthony Calosa
fbce8f343a Merge pull request #1797 from Robbatog/evolving_wilds_world 
Evolving wilds world
 2022-11-30 16:48:04 +08:00
Anthony Calosa
a472ab393c Merge pull request #1979 from tool4ever/zoneFix 
Fix zone choosing when searching
 2022-11-30 06:51:51 +08:00
TRT
f7fd335b10 Fix phasing in attached when entity stopped existing 2022-11-29 20:12:30 +01:00
Anthony Calosa
8ae6100a7c Merge pull request #1794 from Robbatog/enforce_sets_in_quest 
Enforce sets in quest
 2022-11-29 16:47:38 +08:00
TRT
be0d36d15d Mandatory fix 2022-11-28 19:58:13 +01:00
tool4EvEr
cfc92a54f0 Fix zone choosing when searching 2022-11-28 10:07:10 +01:00
Anthony Calosa
b64f20d0a7 Merge pull request #1967 from tool4ever/targeteffects 
Forward another PR part to extract targeting checks from effects
 2022-11-28 15:40:05 +08:00
Anthony Calosa
4396a509d4 Merge pull request #1973 from tool4ever/phasingfix 
Phasing: store under which control it phased out
 2022-11-28 15:17:48 +08:00
tool4ever
57c8644469 Clean up (#1978) 2022-11-27 22:51:42 +00:00
tool4EvEr
53ba3ab213 Fix missing trigger 2022-11-27 12:22:29 +01:00
tool4EvEr
2748804f24 Fix cards 2022-11-27 12:22:16 +01:00
tool4EvEr
fbd2b1eaee Phasing: store under which control it phased out 2022-11-27 12:21:25 +01:00
tool4EvEr
157f99f87f Update new one 2022-11-25 21:50:19 +01:00
tool4EvEr
9fabf6086c The bigger looking ones from more indentation 2022-11-25 21:28:59 +01:00
tool4EvEr
0146e0c72e Multiplayer support 2022-11-25 21:25:58 +01:00
tool4EvEr
9c2f1474ea Small updates 2022-11-25 21:22:56 +01:00
tool4EvEr
212f1398bd Phasing fixes 2022-11-24 13:19:56 +01:00
tool4EvEr
2087c907b8 Fix counting 2022-11-24 12:43:32 +01:00
tool4EvEr
d144ad12ef Fix missing wrap 2022-11-24 11:02:05 +01:00
tool4EvEr
45c586466a Cleanup redundant calls 2022-11-24 10:46:19 +01:00
tool4EvEr
363631990a Better fix for Bow of Nylea / avoid view update if AI only 2022-11-24 09:34:36 +01:00
tool4EvEr
bc1d4f3dce Just let custom toString handle translation 2022-11-24 09:12:39 +01:00
tool4ever
ffbf5c8928 Merge pull request #1955 from Northmoc/j22_brazen 
J22: Brazen Cannonade and support
 2022-11-24 08:01:53 +01:00
tool4EvEr
926038b025 Use register 2022-11-24 07:48:09 +01:00
Northmoc
71b8230f92 Merge pull request #1958 from Northmoc/j22_kenessos 
J22: Kenessos, Priest of Thassa and a little support
 2022-11-23 19:47:12 -05:00
Anthony Calosa
7b358be847 Update CountersPutEffect.java 
fix crash
 2022-11-24 06:32:12 +08:00
Northmoc
865c885664 ChangeZoneEffect.changeZonePlayerInvariant support "OptionalPrompt" 2022-11-23 12:34:28 -05:00
Northmoc
8002029e79 brazen_cannonade.txt and support v2 2022-11-23 11:19:39 -05:00
Anthony Calosa
1e7b2852e3 Merge pull request #1946 from Northmoc/j22_creep 
J22: Creeping Bloodsucker and support
 2022-11-23 20:23:31 +08:00
Anthony Calosa
202c440797 Update CharmEffect.java 
@TRT please check further, just added NPE check so it will not crash
 2022-11-23 15:43:48 +08:00
Northmoc
92df823dd1 EffectEffect support "UntilEndOfYourNextCombat" 2022-11-22 23:13:42 -05:00
Northmoc
18d8bc0c3a GameAction.dealDamage support "RememberAmount" 2022-11-22 18:45:44 -05:00
Anthony Calosa
8a236c4efb Merge pull request #1945 from Simisays/J22 
J22 10 Cards
 2022-11-23 06:24:07 +08:00
tool4EvEr
85398f1273 Fix Debt of Loyalty triggering non-static 2022-11-22 19:31:38 +01:00
tool4EvEr
a10f8f4cb7 Cleanup 2022-11-22 12:26:29 +01:00
Simisays
b4213759b1 update 2022-11-22 10:59:41 +01:00
Anthony Calosa
b8ea883259 Merge pull request #1902 from Northmoc/spaceb 
UNF: space_beleren.txt and support
 2022-11-22 08:54:01 +08:00
Anthony Calosa
f3966ecfef Merge pull request #1906 from Northmoc/ticket 
UNF: Tickets initial implementation
 2022-11-22 08:50:31 +08:00
tool4ever
ac3d9ce8ee Misc cleanup (#1940) 
* Misc cleanup

* Fix check passing with no own creatures

* Improve StackDescription for Unsubstantiate
 2022-11-21 20:37:24 +00:00
Northmoc
35365c0893 Solve issue 1472 (#1528) 
* ManaEffect.resolve add runTriggers boolean

* AbilityManaPart.produceMana incorporate runTriggers boolean

* caged_sun.txt refactor

* AbilityManaPart.produceMana split to add TriggerManaAdded

* TriggerManaAdded.java

* TriggerTapsForMana.java refactor out unneeded

* TriggerType.ManaAdded

* Adjust checks for new Trigger

* Caged Sun fix

* Fix False Dawn only affecting mana abilities

* Rework tapsForMana call

* Clean up

* Support default rules value

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2022-11-21 20:37:01 +00:00
Anthony Calosa
6b3cf252b7 Merge pull request #1913 from Northmoc/comet 
UNF: Comet, Stellar Pup and support
 2022-11-21 07:15:49 +08:00
Northmoc
78b3a20292 CountersPutEffect.getStackDescription improve for player counters 2022-11-19 10:39:25 -05:00
Northmoc
09fa7c00d8 add {TK} 2022-11-19 10:39:22 -05:00
Northmoc
06e9827464 localize sector prompts 2022-11-19 10:37:29 -05:00
Northmoc
014cb36dc5 GameAction notify of sector assignments 2022-11-19 10:37:27 -05:00
Northmoc
61fef27743 ChooseSectorEffect remove unneeded 2022-11-19 10:37:27 -05:00
Northmoc
15b7909171 space_beleren.txt and support 2022-11-19 10:37:18 -05:00
tool4ever
8eca58e9e4 3 fixes (#1925) 
* Improve logic / avoid cheating

* Fix Aggregates.random on FCollection disaster

* Fix finding wrong SA

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2022-11-18 22:37:34 +03:00
Northmoc
b651d6d14d DamageDeal/Prevent use Targets/Defined OR Choices 2022-11-18 13:01:54 -05:00
Northmoc
fe553d50aa UNF: Some die-rolling updates (#1907) 
* attempted_murder.txt

* clown_car.txt

* RollDiceEffect support "EvenOddResults"

* atomwheel_acrobats.txt

* circuits_act.txt

* RollDiceEffect support "DifferentResults"

* monoxa_midway_manager.txt

* TypeLists add Employee

* celebr_8000.txt

* RollDiceEffect support "SubsForEach"

* celebr_8000.txt tweaks

* celebr_8000.txt tweaks2
 2022-11-18 11:32:46 -05:00